From: Michael <heluecht@pirati.ca>
Date: Wed, 25 Jan 2017 05:33:23 +0000 (+0000)
Subject: Improved handling of non string values in the config
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=422be7e212cc52a6776d3b4d01f49e5ff116368a;p=friendica.git

Improved handling of non string values in the config
---

diff --git a/include/Core/Config.php b/include/Core/Config.php
index 2e92b119a4..c495bbd4c7 100644
--- a/include/Core/Config.php
+++ b/include/Core/Config.php
@@ -102,7 +102,7 @@ class Config {
 		);
 		if (dbm::is_result($ret)) {
 			// manage array value
-			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
+			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v']) ? unserialize($ret[0]['v']) : $ret[0]['v']);
 
 			// Assign the value from the database to the cache
 			self::$cache[$family][$key] = $val;
@@ -139,13 +139,10 @@ class Config {
 	public static function set($family, $key, $value) {
 		$a = get_app();
 
-		// We always store boolean values as integer.
-		// And when fetching we don't convert them back to boolean.
+		// We store our setting values in a string variable.
 		// So we have to do the conversion here so that the compare below works.
-		$dbvalue = (is_bool($value) ? (string)intval($value) : $value);
-
-		// Convert the numeric values to string to make the compare work
-		$dbvalue = (is_numeric($value) ? (string)$value : $dbvalue);
+		// The exception are array values.
+		$dbvalue = (!is_array($value) ? (string)$value : $value);
 
 		$stored = self::get($family, $key);