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

[Dirk Haun]

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

Modified Files:
	config.class.php 
Log Message:
Avoid temporarily switching back to the site's default theme when changing a config option (for users that used a different theme)


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** config.class.php	31 May 2008 16:34:08 -0000	1.41
--- config.class.php	14 Jun 2008 15:28:01 -0000	1.42
***************
*** 350,357 ****
      function _post_configuration()
      {
!         $this->config_array['Core']['path_layout'] = $this->config_array['Core']['path_themes']
!             . $this->config_array['Core']['theme'] . '/';
!         $this->config_array['Core']['layout_url'] = $this->config_array['Core']['site_url']
!             . '/layout/' . $this->config_array['Core']['theme'];
      }
  
--- 350,363 ----
      function _post_configuration()
      {
!         global $_USER;
! 
!         if (empty($_USER['theme'])) {
!             $theme = $this->config_array['Core']['theme'];
!         } else {
!             $theme = $_USER['theme'];
!         }
! 
!         $this->config_array['Core']['path_layout'] = $this->config_array['Core']['path_themes'] . $theme . '/';
!         $this->config_array['Core']['layout_url'] = $this->config_array['Core']['site_url'] . '/layout/' . $theme;
      }