extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-08 06:59:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed sometimes wrong prefs for to notified user were used (because more then one user got notified)

Browse Source
This commit is contained in:
Ralf Becker 2009-11-03 10:27:36 +00:00
parent a276e48d48
commit a8f61e517d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,12 +330,10 @@ abstract class bo_tracking
if (!$this->save_prefs) $this->save_prefs = $GLOBALS['egw_info']['user']; if (!$this->save_prefs) $this->save_prefs = $GLOBALS['egw_info']['user'];
if (is_numeric($user_or_lang)) // user --> read everything from his prefs 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']->preferences->preferences($user_or_lang);
$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(); $GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository();
}
if ($check && $this->check2pref) $check = $this->check2pref[$check]; if ($check && $this->check2pref) $check = $this->check2pref[$check];
if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check]) if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check])
{ {

7
etemplate/inc/class.nextmatch_widget.inc.php
View File

@ -1007,7 +1007,12 @@ class nextmatch_widget
case 'select-cat': case 'select-cat':
if ($val) if ($val)
{ {
$value[$key] = $GLOBALS['egw']->categories->id2name($val); $cats = array();
foreach(is_array($val) ? $val : explode(',',$val) as $cat_id)
{
$cats[] = $GLOBALS['egw']->categories->id2name($cat_id);
}
$value[$key] = implode('; ',$cats);
} }
break; break;
case 'date-time': case 'date-time':