Commit db5aad06 authored by Sebastian Kummer's avatar Sebastian Kummer

Merge pull request #98 in ZP/z-push from bugfix/ZP-776-remove-obsolete-check-and-link to develop

* commit '6e2677b0':
  ZP-776 Remove obsolete link and function check.

(cherry picked from commit abf9cd3a)
parent 5b18f0e6
...@@ -240,15 +240,13 @@ class ZPush { ...@@ -240,15 +240,13 @@ class ZPush {
Utils::FixFileOwner(LOGERRORFILE); Utils::FixFileOwner(LOGERRORFILE);
// set time zone // set time zone
// code contributed by Robert Scheck (rsc) - more information: https://developer.berlios.de/mantis/view.php?id=479 // code contributed by Robert Scheck (rsc)
if(function_exists("date_default_timezone_set")) { if(defined('TIMEZONE') ? constant('TIMEZONE') : false) {
if(defined('TIMEZONE') ? constant('TIMEZONE') : false) { if (! @date_default_timezone_set(TIMEZONE))
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')));
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')) {
else if(!ini_get('date.timezone')) { date_default_timezone_set('Europe/Amsterdam');
date_default_timezone_set('Europe/Amsterdam');
}
} }
return true; return true;
...@@ -821,4 +819,4 @@ END; ...@@ -821,4 +819,4 @@ END;
} }
} }
?> ?>
\ No newline at end of file
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