X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FCore%2FConfig.php;h=a93f188148e9c76740edd8205a8823fa895766eb;hb=4322b56c0bca0a6968869137d5cac88791721664;hp=5703558cf336f93103b53659d3e5598286d7daf7;hpb=40fbe1644db3257c9253ea15b55973f1faddbd1c;p=friendica.git

diff --git a/include/Core/Config.php b/include/Core/Config.php
index 5703558cf3..a93f188148 100644
--- 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'];
@@ -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)
 		);
@@ -126,37 +126,19 @@ class Config {
 	public static function set($family,$key,$value) {
 		global $a;
 
-		// If $a->config[$family] has been previously set to '!<unset>!', then
-		// $a->config[$family][$key] will evaluate to $a->config[$family][0], and
-		// $a->config[$family][$key] = $value will be equivalent to
-		// $a->config[$family][0] = $value[0] (this causes infuriating bugs),
-		// so unset the family before assigning a value to a family's key
-		if($a->config[$family] === '!<unset>!')
-			unset($a->config[$family]);
+		$a->config[$family][$key] = $value;
 
 		// manage array value
 		$dbvalue = (is_array($value)?serialize($value):$value);
 		$dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue);
-		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),
-				dbesc($key),
-				dbesc($dbvalue)
-			);
-			if($ret)
-				return $value;
-			return $ret;
-		}
 
-		$ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s'",
-			dbesc($dbvalue),
+		$ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' )
+ON DUPLICATE KEY UPDATE `v` = '%s'",
 			dbesc($family),
-			dbesc($key)
+			dbesc($key),
+			dbesc($dbvalue),
+			dbesc($dbvalue)
 		);
-
-		$a->config[$family][$key] = $value;
-
 		if($ret)
 			return $value;
 		return $ret;