[geeklog-cvs] Geeklog-1.x/system/classes config.class.php, 1.42, 1.43

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/system/classes
In directory qs1489.pair.com:/tmp/cvs-serv8325/system/classes

Modified Files:
	config.class.php 
Log Message:
Allow overriding of rootdebug or other core config variables in siteconfig.php for emergency debugging. [bug 673]

Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** config.class.php	14 Jun 2008 15:28:01 -0000	1.42
--- config.class.php	1 Jul 2008 20:27:35 -0000	1.43
***************
*** 113,117 ****
          while ($row = DB_fetchArray($result)) {
              if ($row[1] !== 'unset') {
!                 $this->config_array[$row[2]][$row[0]] = unserialize($row[1]);
              }
          }
--- 113,119 ----
          while ($row = DB_fetchArray($result)) {
              if ($row[1] !== 'unset') {
!                 if(!array_key_exists($row[2], $this->config_array) || !array_key_exists($row[0], $this->config_array[$row[2]])) {
!                     $this->config_array[$row[2]][$row[0]] = unserialize($row[1]);
!                 }
              }
          }