Fix Issue #2816

[friendica.git] / include / Core / Config.php

diff --git a/include/Core/Config.php b/include/Core/Config.php
index bbae746b44dae2f3fffa457aab61988e819fc802..5703558cf336f93103b53659d3e5598286d7daf7 100644 (file)
--- a/include/Core/Config.php
+++ b/include/Core/Config.php
@@ -2,7 +2,7 @@
 namespace Friendica\Core;
 /**
  * @file include/Core/Config.php
- * 
+ *
  *  @brief Contains the class with methods for system configuration
  */
 
@@ -64,53 +64,32 @@ class Config {
         *  The category of the configuration value
         * @param string $key
         *  The configuration key to query
-        * @param boolean $refresh
-        *  If true the config is loaded from the db and not from the cache
+        * @param mixed $default_value optional
+        *  The value to return if key is not set (default: null)
+        * @param boolean $refresh optional
+        *  If true the config is loaded from the db and not from the cache (default: false)
         * @return mixed Stored value or null if it does not exist
         */
-       public static function get($family, $key, $refresh = false) {
+       public static function get($family, $key, $default_value=null, $refresh = false) {
 
                global $a;
 
-               if(! $instore) {
+               if(! $refresh) {
                        // Looking if the whole family isn't set
                        if(isset($a->config[$family])) {
                                if($a->config[$family] === '!<unset>!') {
-                                       return null;
+                                       return $default_value;
                                }
                        }
 
                        if(isset($a->config[$family][$key])) {
                                if($a->config[$family][$key] === '!<unset>!') {
-                                       return null;
+                                       return $default_value;
                                }
                                return $a->config[$family][$key];
                        }
                }
 
-               // If APC is enabled then fetch the data from there, else try XCache
-               /*if (function_exists("apc_fetch") AND function_exists("apc_exists"))
-                       if (apc_exists($family."|".$key)) {
-                               $val = apc_fetch($family."|".$key);
-                               $a->config[$family][$key] = $val;
-
-                               if ($val === '!<unset>!')
-                                       return false;
-                               else
-                                       return $val;
-                       }
-               elseif (function_exists("xcache_fetch") AND function_exists("xcache_isset"))
-                       if (xcache_isset($family."|".$key)) {
-                               $val = xcache_fetch($family."|".$key);
-                               $a->config[$family][$key] = $val;
-
-                               if ($val === '!<unset>!')
-                                       return false;
-                               else
-                                       return $val;
-                       }
-               */
-
                $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
                        dbesc($family),
                        dbesc($key)
@@ -120,24 +99,12 @@ class Config {
                        $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
                        $a->config[$family][$key] = $val;
 
-                       // If APC is enabled then store the data there, else try XCache
-                       /*if (function_exists("apc_store"))
-                               apc_store($family."|".$key, $val, 600);
-                       elseif (function_exists("xcache_set"))
-                               xcache_set($family."|".$key, $val, 600);*/
-
                        return $val;
                }
                else {
                        $a->config[$family][$key] = '!<unset>!';
-
-                       // If APC is enabled then store the data there, else try XCache
-                       /*if (function_exists("apc_store"))
-                               apc_store($family."|".$key, '!<unset>!', 600);
-                       elseif (function_exists("xcache_set"))
-                               xcache_set($family."|".$key, '!<unset>!', 600);*/
                }
-               return null;
+               return $default_value;
        }
 
        /**
@@ -170,7 +137,7 @@ class Config {
                // manage array value
                $dbvalue = (is_array($value)?serialize($value):$value);
                $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
-               if(self::get($family,$key,true) === false) {
+               if(is_null(self::get($family,$key,null,true))) {
                        $a->config[$family][$key] = $value;
                        $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ",
                                dbesc($family),
@@ -190,12 +157,6 @@ class Config {
 
                $a->config[$family][$key] = $value;
 
-               // If APC is enabled then store the data there, else try XCache
-               /*if (function_exists("apc_store"))
-                       apc_store($family."|".$key, $value, 600);
-               elseif (function_exists("xcache_set"))
-                       xcache_set($family."|".$key, $value, 600);*/
-
                if($ret)
                        return $value;
                return $ret;
@@ -222,11 +183,6 @@ class Config {
                        dbesc($family),
                        dbesc($key)
                );
-               // If APC is enabled then delete the data from there, else try XCache
-               /*if (function_exists("apc_delete"))
-                       apc_delete($family."|".$key);
-               elseif (function_exists("xcache_unset"))
-                       xcache_unset($family."|".$key);*/
 
                return $ret;
        }