diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/block/block.module | 11 | ||||
| -rw-r--r-- | modules/dashboard/dashboard.module | 16 |
2 files changed, 18 insertions, 9 deletions
diff --git a/modules/block/block.module b/modules/block/block.module index 306870b99..374ffdd84 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -574,18 +574,19 @@ function block_theme_initialize($theme) { * array key instead of <i>module</i>_<i>delta</i>. */ function block_list($region) { - $blocks = &drupal_static(__FUNCTION__, array()); + $blocks = &drupal_static(__FUNCTION__); - if (empty($blocks)) { + if (!isset($blocks)) { $blocks = _block_load_blocks(); } - // Create an empty array if there were no entries. + // Create an empty array if there are no entries. if (!isset($blocks[$region])) { $blocks[$region] = array(); } - - $blocks[$region] = _block_render_blocks($blocks[$region]); + else { + $blocks[$region] = _block_render_blocks($blocks[$region]); + } return $blocks[$region]; } diff --git a/modules/dashboard/dashboard.module b/modules/dashboard/dashboard.module index c04c815bc..e7091fe4d 100644 --- a/modules/dashboard/dashboard.module +++ b/modules/dashboard/dashboard.module @@ -208,8 +208,12 @@ function dashboard_admin($launch_customize = FALSE) { * Returns TRUE if the user is currently viewing the dashboard. */ function dashboard_is_visible() { - $menu_item = menu_get_item(); - return isset($menu_item['page_callback']) && $menu_item['page_callback'] == 'dashboard_admin'; + static $is_visible; + if (!isset($is_visible)) { + $menu_item = menu_get_item(); + $is_visible = isset($menu_item['page_callback']) && $menu_item['page_callback'] == 'dashboard_admin'; + } + return $is_visible; } /** @@ -225,7 +229,11 @@ function dashboard_region_descriptions() { * Return an array of dashboard region names. */ function dashboard_regions() { - return array_keys(dashboard_region_descriptions()); + static $regions; + if (!isset($regions)) { + $regions = array_keys(dashboard_region_descriptions()); + } + return $regions; } /** @@ -233,7 +241,7 @@ function dashboard_regions() { */ function dashboard_dashboard_regions() { return array( - 'dashboard_main' => 'Dashboard main', + 'dashboard_main' => 'Dashboard main', 'dashboard_sidebar' => 'Dashboard sidebar', ); } |