From 2f0c5900465d3e12467cc5154394c44b6712759c Mon Sep 17 00:00:00 2001
From: Paweł Sroka <srokap@gmail.com>
Date: Sun, 4 Nov 2012 04:39:50 +0100
Subject: Don't hit DB on elgg_get_config after putting all configuration into
 local object

---
 engine/lib/configuration.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'engine/lib')

diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
index 305aa00b6..540312481 100644
--- a/engine/lib/configuration.php
+++ b/engine/lib/configuration.php
@@ -95,11 +95,14 @@ function elgg_get_config($name, $site_guid = 0) {
 		// installation wide setting
 		$value = datalist_get($name);
 	} else {
-		// site specific setting
-		if ($site_guid == 0) {
-			$site_guid = (int) $CONFIG->site_id;
+		// hit DB only if we're not sure if value exists or not
+		if (!isset($CONFIG->site_config_loaded)) {
+			// site specific setting
+			if ($site_guid == 0) {
+				$site_guid = (int) $CONFIG->site_id;
+			}
+			$value = get_config($name, $site_guid);
 		}
-		$value = get_config($name, $site_guid);
 	}
 
 	if ($value !== false) {
@@ -558,6 +561,8 @@ function _elgg_load_site_config() {
 	$CONFIG->url = $CONFIG->wwwroot;
 
 	get_all_config();
+	// gives hint to elgg_get_config function how to approach missing values
+	$CONFIG->site_config_loaded = true;
 }
 
 /**
-- 
cgit v1.2.3


From 8e0355da502d3e61e6c5ef66f34831cfbad6506e Mon Sep 17 00:00:00 2001
From: Steve Clay <steve@mrclay.org>
Date: Tue, 27 Nov 2012 23:05:03 -0500
Subject: elgg_get_config: Don't generate NOTICE if $value not set

---
 engine/lib/configuration.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'engine/lib')

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;
 }
 
 /**
-- 
cgit v1.2.3