Better check for PHP version in setMagicQuotesRuntime() as set_magic_quotes_runtime...

[core.git] / inc / config / class_FrameworkConfiguration.php

diff --git a/inc/config/class_FrameworkConfiguration.php b/inc/config/class_FrameworkConfiguration.php
index 914d13a183b397e0d77b573176932c384be6dd50..81ac5821c283f06b1da58ac1a2997778bdfee1a8 100644 (file)
--- a/inc/config/class_FrameworkConfiguration.php
+++ b/inc/config/class_FrameworkConfiguration.php
@@ -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]);