diff --git a/etemplate/inc/class.bo_tracking.inc.php b/etemplate/inc/class.bo_tracking.inc.php index 74ea805448..d0224e168e 100644 --- a/etemplate/inc/class.bo_tracking.inc.php +++ b/etemplate/inc/class.bo_tracking.inc.php @@ -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->preferences($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]) { diff --git a/etemplate/inc/class.nextmatch_widget.inc.php b/etemplate/inc/class.nextmatch_widget.inc.php index 509d3d3f6b..82f7b26bf1 100644 --- a/etemplate/inc/class.nextmatch_widget.inc.php +++ b/etemplate/inc/class.nextmatch_widget.inc.php @@ -1007,7 +1007,12 @@ class nextmatch_widget case 'select-cat': 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; case 'date-time':