mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-13 12:32:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-55760-master' of https://github.com/StudiUM/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2016-09-27 10:18:35 +01:00
commit 13a18809e6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/tool/lp/classes/output/plan_page.php
View File

@ -95,13 +95,15 @@ class plan_page implements renderable, templatable {
// Get the scale.
$scaleid = $comp->get_scaleid();
$compscale = $comp->get_scale();
if ($scaleid === null) {
$scaleid = $framework->get_scaleid();
$compscale = $framework->get_scale();
}
if (!isset($scales[$framework->get_scaleid()])) {
$scales[$framework->get_scaleid()] = $framework->get_scale();
if (!isset($scales[$scaleid])) {
$scales[$scaleid] = $compscale;
}
$scale = $scales[$framework->get_scaleid()];
$scale = $scales[$scaleid];
// Prepare the data.
$record = new stdClass();