extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: vaction notice indicator in mail showed result of other users

Browse Source 
cache-key was identical for all uses due to a typo
This commit is contained in:
Ralf Becker 2014-09-27 15:27:54 +00:00
parent 70689708a3
commit 32a6066156
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/inc/class.mail_sieve.inc.php
View File

@ -631,9 +631,9 @@ class mail_sieve
self::setAsyncJob($newVacation); self::setAsyncJob($newVacation);
} }
//Reset vacationNotice cache which is used in mail_ui get_rows //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; $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.'); $msg = lang('Vacation notice sucessfully updated.');
} }

4
mail/inc/class.mail_ui.inc.php
View File

@ -2290,7 +2290,7 @@ class mail_ui
$cachedVacations = array($sieveServer->acc_id => $vacation) + (array)$cachedVacations; $cachedVacations = array($sieveServer->acc_id => $vacation) + (array)$cachedVacations;
// Set vacation to the instance cache for particular account with expiration of one day // 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) catch (PEAR_Exception $ex)
{ {
@ -3917,7 +3917,7 @@ class mail_ui
public static function ajax_refreshVacationNotice($icServerID=null) public static function ajax_refreshVacationNotice($icServerID=null)
{ {
//Get vacation from cache if it's available //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]; $vacation = $cachedVacations[$icServerID];
if (!$vacation) if (!$vacation)