From: Steve Clay <steve@mrclay.org>
Date: Wed, 28 Nov 2012 04:05:03 +0000 (-0500)
Subject: elgg_get_config: Don't generate NOTICE if $value not set
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8e0355da502d3e61e6c5ef66f34831cfbad6506e;p=lorea%2Felgg.git

elgg_get_config: Don't generate NOTICE if $value not set
---

diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 540312481..b10e51130 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -91,7 +91,7 @@ function elgg_get_config($name, $site_guid = 0) {
 		return $CONFIG->$name;
 	}
 
-	if ($site_guid === NULL) {
+	if ($site_guid === null) {
 		// installation wide setting
 		$value = datalist_get($name);
 	} else {
@@ -102,15 +102,18 @@ function elgg_get_config($name, $site_guid = 0) {
 				$site_guid = (int) $CONFIG->site_id;
 			}
 			$value = get_config($name, $site_guid);
+		} else {
+			$value = null;
 		}
 	}
 
-	if ($value !== false) {
-		$CONFIG->$name = $value;
-		return $value;
+	// @todo document why we don't cache false
+	if ($value === false) {
+		return null;
 	}
 
-	return null;
+	$CONFIG->$name = $value;
+	return $value;
 }
 
 /**