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

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

diff --git a/include/Core/Config.php b/include/Core/Config.php
index e5515efafc43b75ff600069c1360c57d0af17531..6ef394f2f1cb8cd65aa233eb5d1e1e65b340fb8e 100644 (file)
--- a/include/Core/Config.php
+++ b/include/Core/Config.php
@@ -32,7 +32,7 @@ class Config {
        public static function load($family) {
                global $a;
 
-               $r = q("SELECT `v`, `k` FROM `config` WHERE `cat` = '%s'", dbesc($family));
+               $r = q("SELECT `v`, `k` FROM `config` WHERE `cat` = '%s' ORDER BY `cat`, `k`, `id`", dbesc($family));
                if(count($r)) {
                        foreach($r as $rr) {
                                $k = $rr['k'];
@@ -70,7 +70,7 @@ class Config {
         *  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, $default_value=null, $refresh = false) {
+       public static function get($family, $key, $default_value = null, $refresh = false) {
 
                global $a;
 
@@ -90,7 +90,7 @@ class Config {
                        }
                }
 
-               $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
+               $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' ORDER BY `id` DESC LIMIT 1",
                        dbesc($family),
                        dbesc($key)
                );
@@ -123,14 +123,14 @@ class Config {
         *  The value to store
         * @return mixed Stored $value or false if the database update failed
         */
-       public static function set($family,$key,$value) {
+       public static function set($family, $key, $value) {
                global $a;
 
                $a->config[$family][$key] = $value;
 
                // manage array value
-               $dbvalue = (is_array($value)?serialize($value):$value);
-               $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
+               $dbvalue = is_array($value) ? serialize($value) : $value;
+               $dbvalue = is_bool($dbvalue) ? intval($dbvalue) : $dbvalue;
 
                $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' )
 ON DUPLICATE KEY UPDATE `v` = '%s'",
@@ -139,8 +139,9 @@ ON DUPLICATE KEY UPDATE `v` = '%s'",
                        dbesc($dbvalue),
                        dbesc($dbvalue)
                );
-               if($ret)
+               if ($ret) {
                        return $value;
+               }
                return $ret;
        }