forked from extern/egroupware
Fixed some typos and IE-specific problems
This commit is contained in:
parent
c953709866
commit
e8cc19df9a
@ -507,6 +507,11 @@ abstract class egw_framework
|
|||||||
return egw::link($index,$GLOBALS['egw_info']['flags']['params'][$app]);
|
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
|
* Internal usort callback function used to sort an array according to the
|
||||||
* user sort order
|
* user sort order
|
||||||
@ -514,7 +519,7 @@ abstract class egw_framework
|
|||||||
private static function _sort_apparray($a, $b)
|
private static function _sort_apparray($a, $b)
|
||||||
{
|
{
|
||||||
//Unserialize the user_apporder array
|
//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_a = isset($arr[$a['name']]) ? $arr[$a['name']] : null;
|
||||||
$ind_b = isset($arr[$b['name']]) ? $arr[$b['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'])
|
if ($GLOBALS['egw_info']['user']['preferences']['common']['user_apporder'])
|
||||||
{
|
{
|
||||||
//Sort the application array using the user_apporder array as sort index
|
//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');
|
uasort($apps, 'egw_framework::_sort_apparray');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($GLOBALS['egw_info']['flags']['currentapp'] == 'preferences' || $GLOBALS['egw_info']['flags']['currentapp'] == 'about')
|
if ($GLOBALS['egw_info']['flags']['currentapp'] == 'preferences' || $GLOBALS['egw_info']['flags']['currentapp'] == 'about')
|
||||||
{
|
{
|
||||||
$app = $app_title = 'EGroupware';
|
$app = $app_title = 'EGroupware';
|
||||||
|
Loading…
Reference in New Issue
Block a user