Commit 19b811fa authored by Vincent Sherwood's avatar Vincent Sherwood

ZP-773 Removed Berlios reference from contribution, and removed check for...

ZP-773 Removed Berlios reference from contribution, and removed check for function date_default_timezone_set(). Released under the Affero GNU General Public License (AGPL) version 3.
parent 636984ea
......@@ -266,15 +266,13 @@ class ZPushAutodiscover {
}
// set time zone
// code contributed by Robert Scheck (rsc) - more information: https://developer.berlios.de/mantis/view.php?id=479
if(function_exists("date_default_timezone_set")) {
if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
if (! @date_default_timezone_set(TIMEZONE))
throw new FatalMisconfigurationException(sprintf("The configured TIMEZONE '%s' is not valid. Please check supported timezones at http://www.php.net/manual/en/timezones.php", constant('TIMEZONE')));
}
else if(!ini_get('date.timezone')) {
date_default_timezone_set('Europe/Amsterdam');
}
// code contributed by Robert Scheck (rsc)
if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
if (! @date_default_timezone_set(TIMEZONE))
throw new FatalMisconfigurationException(sprintf("The configured TIMEZONE '%s' is not valid. Please check supported timezones at http://www.php.net/manual/en/timezones.php", constant('TIMEZONE')));
}
else if(!ini_get('date.timezone')) {
date_default_timezone_set('Europe/Amsterdam');
}
ZPushAutodiscover::DoZPushAutodiscover();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment