Prevent a memory Access Violation when the database isn't connected

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

diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php
index c47559d0ebd257e637fcc02a6bdc236e7bcf1b05..c5e8335d88bbd96fd307d76735c4d64ce2845957 100644 (file)
--- a/include/Core/PConfig.php
+++ b/include/Core/PConfig.php
@@ -29,7 +29,7 @@ class PConfig {
         */
        public static function load($uid,$family) {
                global $a;
-               $r = q("SELECT `v`,`k` FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d",
+               $r = q("SELECT `v`,`k` FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d ORDER BY `cat`, `k`, `id`",
                        dbesc($family),
                        intval($uid)
                );
@@ -67,7 +67,7 @@ class PConfig {
 
                global $a;
 
-               if(! $instore) {
+               if(! $refresh) {
                        // Looking if the whole family isn't set
                        if(isset($a->config[$uid][$family])) {
                                if($a->config[$uid][$family] === '!<unset>!') {
@@ -83,30 +83,7 @@ class PConfig {
                        }
                }
 
-               // 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($uid."|".$family."|".$key)) {
-                               $val = apc_fetch($uid."|".$family."|".$key);
-                               $a->config[$uid][$family][$key] = $val;
-
-                               if ($val === '!<unset>!')
-                                       return false;
-                               else
-                                       return $val;
-                       }
-               elseif (function_exists("xcache_get") AND function_exists("xcache_isset"))
-                       if (xcache_isset($uid."|".$family."|".$key)) {
-                               $val = xcache_get($uid."|".$family."|".$key);
-                               $a->config[$uid][$family][$key] = $val;
-
-                               if ($val === '!<unset>!')
-                                       return false;
-                               else
-                                       return $val;
-                       }*/
-
-
-               $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1",
+               $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' ORDER BY `id` DESC LIMIT 1",
                        intval($uid),
                        dbesc($family),
                        dbesc($key)
@@ -116,22 +93,10 @@ class PConfig {
                        $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
                        $a->config[$uid][$family][$key] = $val;
 
-                       // If APC is enabled then store the data there, else try XCache
-                       /*if (function_exists("apc_store"))
-                               apc_store($uid."|".$family."|".$key, $val, 600);
-                       elseif (function_exists("xcache_set"))
-                               xcache_set($uid."|".$family."|".$key, $val, 600);*/
-
                        return $val;
                }
                else {
                        $a->config[$uid][$family][$key] = '!<unset>!';
-
-                       // If APC is enabled then store the data there, else try XCache
-                       /*if (function_exists("apc_store"))
-                               apc_store($uid."|".$family."|".$key, '!<unset>!', 600);
-                       elseif (function_exists("xcache_set"))
-                               xcache_set($uid."|".$family."|".$key, '!<unset>!', 600);*/
                }
                return $default_value;
        }
@@ -154,43 +119,26 @@ class PConfig {
         *  The value to store
         * @return mixed Stored $value or false
         */
-       public static function set($uid,$family,$key,$value) {
+       public static function set($uid, $family, $key, $value) {
 
                global $a;
 
                // manage array value
                $dbvalue = (is_array($value)?serialize($value):$value);
 
-               if(self::get($uid,$family,$key,null, true) === false) {
-                       $a->config[$uid][$family][$key] = $value;
-                       $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ",
-                               intval($uid),
-                               dbesc($family),
-                               dbesc($key),
-                               dbesc($dbvalue)
-                       );
-                       if($ret) 
-                               return $value;
-                       return $ret;
-               }
-               $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
-                       dbesc($dbvalue),
+               $a->config[$uid][$family][$key] = $value;
+
+               $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' )
+ON DUPLICATE KEY UPDATE `v` = '%s'",
                        intval($uid),
                        dbesc($family),
-                       dbesc($key)
+                       dbesc($key),
+                       dbesc($dbvalue),
+                       dbesc($dbvalue)
                );
-
-               $a->config[$uid][$family][$key] = $value;
-
-               // If APC is enabled then store the data there, else try XCache
-               /*if (function_exists("apc_store"))
-                       apc_store($uid."|".$family."|".$key, $value, 600);
-               elseif (function_exists("xcache_set"))
-                       xcache_set($uid."|".$family."|".$key, $value, 600);*/
-
-
-               if($ret)
+               if ($ret) {
                        return $value;
+               }
                return $ret;
        }