extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-23 00:13:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

"- fixed wrong languague in notifications, because translation->userlang was changed to a static class-var

Browse Source 
- fixed sometimes wrong prefs for to notified user were used (because more then one user got notified)"
This commit is contained in:
Ralf Becker 2009-11-03 10:25:45 +00:00
parent 6e8c917110
commit f15d6c3976
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etemplate/inc/class.bo_tracking.inc.php
View File

@ -302,9 +302,9 @@ abstract class bo_tracking
// restore the user enviroment
if ($this->save_prefs) $GLOBALS['egw_info']['user'] = $this->save_prefs; unset($this->save_prefs);
if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != $GLOBALS['egw']->translation->userlang)
if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != translation::$userlang)
{
$GLOBALS['egw']->translation->init();
translation::init();
}
return !count($this->errors);
}
@ -331,11 +331,9 @@ abstract class bo_tracking
if (is_numeric($user_or_lang)) // user --> read everything from his prefs
{
if ($user_or_lang != $this->user)
{
$GLOBALS['egw']->preferences->preferences($user_or_lang);
$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
}
$GLOBALS['egw']->preferences->__construct($user_or_lang);
$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
if ($check && $this->check2pref) $check = $this->check2pref[$check];
if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check])
{
@ -356,9 +354,9 @@ abstract class bo_tracking
$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->default;
$GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $user_or_lang;
}
if ($lang != $GLOBALS['egw']->translation->userlang) // load the right language if needed
if ($lang != translation::$userlang) // load the right language if needed
{
$GLOBALS['egw']->translation->init();
translation::init();
}
// send over notification_app