From b9c985e045b4a60ca47c85bfb548f63e2ffb9a1d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 27 Sep 2014 15:28:16 +0000 Subject: [PATCH] * Mail: vaction notice indicator in mail showed result of other users cache-key was identical for all uses due to a typo --- mail/inc/class.mail_sieve.inc.php | 4 ++-- mail/inc/class.mail_ui.inc.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mail/inc/class.mail_sieve.inc.php b/mail/inc/class.mail_sieve.inc.php index dac08bf07b..6cfecd1d1d 100644 --- a/mail/inc/class.mail_sieve.inc.php +++ b/mail/inc/class.mail_sieve.inc.php @@ -621,9 +621,9 @@ class mail_sieve self::setAsyncJob($newVacation); } //Reset vacationNotice cache which is used in mail_ui get_rows - $cachedVacations = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$GLOBALS['egw_info']['user']['account_lid']); + $cachedVacations = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']); $cachedVacations = array($icServer->acc_id => $newVacation) + (array)$cachedVacations; - egw_cache::setCache(egw_cache::INSTANCE,'email', 'vacationNotice'+$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations); + egw_cache::setCache(egw_cache::INSTANCE,'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations); $msg = lang('Vacation notice sucessfully updated.'); } diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php index 00872e6e4c..1bedd3821b 100644 --- a/mail/inc/class.mail_ui.inc.php +++ b/mail/inc/class.mail_ui.inc.php @@ -2290,7 +2290,7 @@ class mail_ui $cachedVacations = array($sieveServer->acc_id => $vacation) + (array)$cachedVacations; // Set vacation to the instance cache for particular account with expiration of one day - egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60*60*24); + egw_cache::setCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations, 60*60*24); } catch (PEAR_Exception $ex) { @@ -3917,7 +3917,7 @@ class mail_ui public static function ajax_refreshVacationNotice($icServerID=null) { //Get vacation from cache if it's available - $cachedVacations = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'+$GLOBALS['egw_info']['user']['account_lid']); + $cachedVacations = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']); $vacation = $cachedVacations[$icServerID]; if (!$vacation)