moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eloy is probably right, the preferred width calculation should be cached.

Browse source
This commit is contained in:
defacer 2004-04-20 07:32:57 +00:00
parent 1eb25080df
commit 82b181f265
1 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
course/view.php
View file

@ -47,10 +47,6 @@
$courseformat = 0; $courseformat = 0;
} }
//We *always* need to get active blocks (perhaps this should be cached
//in a session object and updated in when editing = true ????
$recblocks = get_records('blocks','visible','1');
// Doing this now so we can pass the results to block_action() // Doing this now so we can pass the results to block_action()
// and dodge the overhead of doing the same work twice. // and dodge the overhead of doing the same work twice.
@ -94,11 +90,11 @@
$editing = $USER->editing; $editing = $USER->editing;
if (isset($hide)) { if (isset($hide)) {
set_section_visible($course->id, $hide, "0"); set_section_visible($course->id, $hide, '0');
} }
if (isset($show)) { if (isset($show)) {
set_section_visible($course->id, $show, "1"); set_section_visible($course->id, $show, '1');
} }
if (isset($_GET['blockaction'])) { if (isset($_GET['blockaction'])) {
@ -111,6 +107,8 @@
$allblocks = array_merge($leftblocks, $rightblocks); $allblocks = array_merge($leftblocks, $rightblocks);
$missingblocks = array(); $missingblocks = array();
$recblocks = get_records('blocks','visible','1');
if($editing && $recblocks) { if($editing && $recblocks) {
foreach($recblocks as $recblock) { foreach($recblocks as $recblock) {
// If it's not hidden or displayed right now... // If it's not hidden or displayed right now...
@ -124,7 +122,6 @@
} }
} }
if (!empty($section)) { if (!empty($section)) {
if (!empty($move)) { if (!empty($move)) {
if (!move_section($course, $section, $move)) { if (!move_section($course, $section, $move)) {
@ -171,12 +168,26 @@
} }
} }
//Calculate left and right width. This has to be calculated *always*. Perhaps // If the block width cache is not set, set it
//we could cache it in a session variable and update it only when editing=true ???? if(!isset($SESSION->blockcache->width->{$course->id}) || $editing) {
//This caused some display problems (100 width) in student mode.
// This query might be optimized away if we 're in editing mode
if(!isset($recblocks)) {
$recblocks = get_records('blocks','visible','1');
}
$preferred_width_left = blocks_preferred_width($leftblocks, $recblocks); $preferred_width_left = blocks_preferred_width($leftblocks, $recblocks);
$preferred_width_right = blocks_preferred_width($rightblocks, $recblocks); $preferred_width_right = blocks_preferred_width($rightblocks, $recblocks);
// This may be kind of organizational overkill, granted...
// But is there any real need to simplify the structure?
$SESSION->blockcache->width->{$course->id}->left = $preferred_width_left;
$SESSION->blockcache->width->{$course->id}->right = $preferred_width_right;
}
else {
$preferred_width_left = $SESSION->blockcache->width->{$course->id}->left;
$preferred_width_right = $SESSION->blockcache->width->{$course->id}->right;
}
require("$CFG->dirroot/course/format/$course->format/format.php"); // Include the actual course format require("$CFG->dirroot/course/format/$course->format/format.php"); // Include the actual course format
print_footer(); print_footer();