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

[Dirk Haun]

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

Modified Files:
	config.class.php 
Log Message:
Fixed setting the site's default language and default theme (bugs #0000646 and #0000648)


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** config.class.php	11 May 2008 07:07:20 -0000	1.40
--- config.class.php	31 May 2008 16:34:08 -0000	1.41
***************
*** 689,694 ****
--- 689,710 ----
      function updateConfig($change_array, $group)
      {
+         global $_TABLES;
+ 
          if (!SEC_inGroup('Root')) {
              return null;
+         }
+ 
+         if ($group == 'Core') {
+             /**
+              * $_CONF['theme'] and $_CONF['language'] are overwritten with
+              * the user's preferences in lib-common.php. Re-read values from
+              * the database so that we're comparing the correct values below.
+              */
+             $value = DB_getItem($_TABLES['conf_values'], 'value',
+                                 "group_name='Core' AND name='theme'");
+             $this->config_array['Core']['theme'] = unserialize($value);
+             $value = DB_getItem($_TABLES['conf_values'], 'value',
+                                 "group_name='Core' AND name='language'");
+             $this->config_array['Core']['language'] = unserialize($value);
          }