holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for invalid operand, if vacation cache is not yet initialised

Browse Source
This commit is contained in:
Ralf Becker 2014-08-11 14:16:26 +00:00
parent e06b02f6f6
commit 217a2a8a11
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2300,10 +2300,12 @@ class mail_ui
$sieveServer->retrieveRules(); $sieveServer->retrieveRules();
$vacation = $sieveServer->getVacation(); $vacation = $sieveServer->getVacation();
$cachedVacations = array($sieveServer->acc_id => $vacation) + $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)
{
$this->callWizard($ex->getMessage(), true, 'error'); $this->callWizard($ex->getMessage(), true, 'error');
} }
} }