mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-19 05:01:12 +01:00
Backport commit r48032 committed by Ralf Becker. Fix for invalid operand, if vacation cache is not yet initialised
This commit is contained in:
parent
76f2141502
commit
ed5d06544b
@ -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');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user