From 8e19d799f6bc5b668f8a241464d2e544611d079f Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Wed, 11 Nov 2009 08:52:53 +0000 Subject: - Patch #619902 by sun: performance improvement: dashboard, region and block building had unnecessary function calls. --- modules/dashboard/dashboard.module | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'modules/dashboard') 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', ); } -- cgit v1.2.3