From e8cc19df9a30cfeaa43c9458355b040dd0c0f12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=B6ckel?= Date: Wed, 16 Jun 2010 12:48:17 +0000 Subject: [PATCH] Fixed some typos and IE-specific problems --- phpgwapi/inc/class.egw_framework.inc.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 6aa10901a3..28397e8633 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -507,6 +507,11 @@ abstract class egw_framework return egw::link($index,$GLOBALS['egw_info']['flags']['params'][$app]); } + /** + * Used internally to store unserialized value of $GLOBALS['egw_info']['user']['preferences']['common']['user_apporder'] + */ + private static $user_apporder = array(); + /** * Internal usort callback function used to sort an array according to the * user sort order @@ -514,7 +519,7 @@ abstract class egw_framework private static function _sort_apparray($a, $b) { //Unserialize the user_apporder array - $arr = unserialize($GLOBALS['egw_info']['user']['preferences']['common']['user_apporder']); + $arr = self::$user_apporder; $ind_a = isset($arr[$a['name']]) ? $arr[$a['name']] : null; $ind_b = isset($arr[$b['name']]) ? $arr[$b['name']] : null; @@ -607,10 +612,11 @@ abstract class egw_framework if ($GLOBALS['egw_info']['user']['preferences']['common']['user_apporder']) { //Sort the application array using the user_apporder array as sort index + self::$user_apporder = + unserialize($GLOBALS['egw_info']['user']['preferences']['common']['user_apporder']); uasort($apps, 'egw_framework::_sort_apparray'); } - if ($GLOBALS['egw_info']['flags']['currentapp'] == 'preferences' || $GLOBALS['egw_info']['flags']['currentapp'] == 'about') { $app = $app_title = 'EGroupware';