From 023c43fa4a9a5d041fa5a6c49bf5208816d0a05b Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Wed, 8 Jun 2016 21:52:10 +0200
Subject: [PATCH] config && pconfig: return NULL if config is unset

---
 include/Config.php  | 13 +++++++------
 include/PConfig.php | 14 +++++++-------
 include/config.php  | 23 ++++++++++++++++-------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/include/Config.php b/include/Config.php
index 62022b62b..e08a7de74 100644
--- a/include/Config.php
+++ b/include/Config.php
@@ -64,10 +64,11 @@ class Config {
 	 *  The category of the configuration value
 	 * @param string $key
 	 *  The configuration key to query
-	 * @param boolean $instore Determines if the key already exists in the DB
-	 * @return mixed Stored value or false if it does not exist
+	 * @param boolean $refresh
+	 *  If true the config is loaded from the db and not from the cache
+	 * @return mixed Stored value or null if it does not exist
 	 */
-	public static function get($family, $key, $instore = false) {
+	public static function get($family, $key, $refresh = false) {
 
 		global $a;
 
@@ -75,13 +76,13 @@ class Config {
 			// Looking if the whole family isn't set
 			if(isset($a->config[$family])) {
 				if($a->config[$family] === '!<unset>!') {
-					return false;
+					return null;
 				}
 			}
 
 			if(isset($a->config[$family][$key])) {
 				if($a->config[$family][$key] === '!<unset>!') {
-					return false;
+					return null;
 				}
 				return $a->config[$family][$key];
 			}
@@ -136,7 +137,7 @@ class Config {
 			elseif (function_exists("xcache_set"))
 				xcache_set($family."|".$key, '!<unset>!', 600);*/
 		}
-		return false;
+		return null;
 	}
 
 	/**
diff --git a/include/PConfig.php b/include/PConfig.php
index 06e470e97..5ee4ec692 100644
--- a/include/PConfig.php
+++ b/include/PConfig.php
@@ -57,11 +57,11 @@ class PConfig {
 	 *  The category of the configuration value
 	 * @param string $key
 	 *  The configuration key to query
-	 * @param boolean $instore
-	 * Determines if the key already exists in the DB
-	 * @return mixed Stored value or false if it does not exist
+	 * @param boolean $refresh
+	 *  If true the config is loaded from the db and not from the cache
+	 * @return mixed Stored value or null if it does not exist
 	 */
-	public static function get($uid,$family, $key, $instore = false) {
+	public static function get($uid, $family, $key, $refresh = false) {
 
 		global $a;
 
@@ -69,13 +69,13 @@ class PConfig {
 			// Looking if the whole family isn't set
 			if(isset($a->config[$uid][$family])) {
 				if($a->config[$uid][$family] === '!<unset>!') {
-					return false;
+					return null;
 				}
 			}
 
 			if(isset($a->config[$uid][$family][$key])) {
 				if($a->config[$uid][$family][$key] === '!<unset>!') {
-					return false;
+					return null;
 				}
 				return $a->config[$uid][$family][$key];
 			}
@@ -131,7 +131,7 @@ class PConfig {
 			elseif (function_exists("xcache_set"))
 				xcache_set($uid."|".$family."|".$key, '!<unset>!', 600);*/
 		}
-		return false;
+		return null;
 	}
 
 	/**
diff --git a/include/config.php b/include/config.php
index d8c97744e..8f36dbdc8 100644
--- a/include/config.php
+++ b/include/config.php
@@ -39,11 +39,16 @@ function load_config($family) {
  *  The category of the configuration value
  * @param string $key
  *  The configuration key to query
- * @param boolean $instore Determines if the key already exists in the DB
+ * @param boolean $refresh
+ *  If true the config is loaded from the db and not from the cache
  * @return mixed Stored value or false if it does not exist
  */
-function get_config($family, $key, $instore = false) {
-	return Config::get($family, $key, $instore);
+function get_config($family, $key, $refresh = false) {
+	$v = Config::get($family, $key, $refresh);
+	if(is_null($v))
+		$v = false;
+
+	return $v;
 }
 
 /**
@@ -105,12 +110,16 @@ function load_pconfig($uid,$family) {
  *  The category of the configuration value
  * @param string $key
  *  The configuration key to query
- * @param boolean $instore
- * Determines if the key already exists in the DB
+ * @param boolean $refresh
+ *  If true the config is loaded from the db and not from the cache
  * @return mixed Stored value or false if it does not exist
  */
-function get_pconfig($uid,$family, $key, $instore = false) {
-	return PConfig::get($uid, $family, $key, $instore);
+function get_pconfig($uid, $family, $key, $refresh = false) {
+	$v = PConfig::get($uid, $family, $key, $refresh);
+	if(is_null($v))
+		$v = false;
+
+	return $v;
 }
 
 /**