Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#232037 by pwolanin: (performance) block regions should only be populated when called for, not in all cases (fixes performance expectation on 403/404 pages)

5.x
Neil Drumm 2008-04-17 07:12:15 +00:00
parent 73eff99bf4
commit fe554d302f
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/block/block.module
View File

@ -684,8 +684,23 @@ function block_list($region) {
else { else {
$page_match = TRUE; $page_match = TRUE;
} }
$block->enabled = $enabled;
$block->page_match = $page_match;
$blocks[$block->region]["{$block->module}_{$block->delta}"] = $block;
}
}
if ($enabled && $page_match) { // Create an empty array if there were no entries
if (!isset($blocks[$region])) {
$blocks[$region] = array();
}
foreach ($blocks[$region] as $key => $block) {
// Render the block content if it has not been created already.
if (!isset($block->content)) {
// Erase the block from the static array - we'll put it back if it has content.
unset($blocks[$region][$key]);
if ($block->enabled && $block->page_match) {
// Check the current throttle status and see if block should be displayed // Check the current throttle status and see if block should be displayed
// based on server load. // based on server load.
if (!($block->throttle && (module_invoke('throttle', 'status') > 0))) { if (!($block->throttle && (module_invoke('throttle', 'status') > 0))) {
@ -707,9 +722,5 @@ function block_list($region) {
} }
} }
} }
// Create an empty array if there were no entries
if (!isset($blocks[$region])) {
$blocks[$region] = array();
}
return $blocks[$region]; return $blocks[$region];
} }