X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fconfig%2Fclass_FrameworkConfiguration.php;h=1f62f6994ad313dbe8eedf0c469db799a6994fc9;hb=6327d67d057b505a33549c656310ee1f9ed1cffa;hp=914d13a183b397e0d77b573176932c384be6dd50;hpb=202aa130a32c1cd218f883b06c32827a799c9497;p=core.git diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php index 914d13a1..1f62f699 100644 --- a/inc/config/class_FrameworkConfiguration.php +++ b/inc/config/class_FrameworkConfiguration.php @@ -6,11 +6,11 @@ * class loader. See inc/loader/class_ClassLoader.php for instance * * @see ClassLoader - * @author Roland Haeder + * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team * @license GNU GPL 3.0 or any newer version - * @link http://www.ship-simu.org + * @link http://www.shipsimu.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -97,8 +97,12 @@ class FrameworkConfiguration implements Registerable { * @return void */ public final function setDefaultTimezone ($zone) { - // At least 5.1.0 is required for this! - if (version_compare(phpversion(), '5.1.0')) { + // Is PHP version 5.1.0 or higher? Older versions are being ignored + if (version_compare(phpversion(), '5.1.0', '>=')) { + /* + * Set desired time zone to prevent date() and related functions to + * issue a E_WARNING. + */ date_default_timezone_set($zone); } // END - if } @@ -108,8 +112,15 @@ class FrameworkConfiguration implements Registerable { * * @param $enableQuotes Whether enable magic runtime quotes (should be disabled for security reasons) * @return void + * @todo This method encapsulates a deprecated PHP function and should be deprecated, too. */ public final function setMagicQuotesRuntime ($enableQuotes) { + // Is the PHP version < 5.4? + if (version_compare(phpversion(), '5.4', '>=')) { + // Then silently skip this part as set_magic_quotes_runtime() is deprecated + return; + } // END - if + // Cast it to boolean $enableQuotes = (boolean) $enableQuotes; @@ -123,7 +134,7 @@ class FrameworkConfiguration implements Registerable { * @param $configEntry The configuration entry we shall check * @return $isset Whether the given configuration entry is set */ - protected function isConfigurationEntrySet ($configEntry) { + public function isConfigurationEntrySet ($configEntry) { // Is it set? $isset = isset($this->config[$configEntry]);