From 2caa00b46a57ae6514f284d4f6cd13cc02eb14cd Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Thu, 15 Sep 2005 09:50:18 +0000
Subject: [PATCH] Add a "default" option to return if a given item isn't in the config files.

---
 lib/config/config.inc.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/config/config.inc.php b/lib/config/config.inc.php
index 1705098..9e332c7 100644
--- a/lib/config/config.inc.php
+++ b/lib/config/config.inc.php
@@ -2,7 +2,7 @@
 
 require_once("Config.php");
 
-define("KT_CONFIG_DEFAULT", true);
+require_once(KT_LIB_DIR . '/util/ktutil.inc');
 
 class KTConfig {
     var $conf = array();
@@ -67,22 +67,23 @@ class KTConfig {
         return $v;
     }
 
-    function get($var) {
+    function get($var, $oDefault = null) {
         if (array_key_exists($var, $this->flatns)) {
             return $this->expand($this->flatns[$var]);
         }
         if (array_key_exists($var, $this->flat)) {
             return $this->expand($this->flat[$var]);
         }
-        return null;
+        return $oDefault;;
     }
 
     function &getSingleton() {
-        global $KTConfig;
-        return $KTConfig;
+        if (!KTUtil::arrayGet($GLOBALS, 'KTConfig')) {
+            $GLOBALS['KTConfig'] =& new KTConfig;
+        }
+        return $GLOBALS['KTConfig'];
     }
 }
 
-$KTConfig =& new KTConfig;
 
 ?>
--
libgit2 0.21.4