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

[Dirk Haun]

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

Modified Files:
	config.class.php 
Log Message:
Provide the standard set of template variables


Index: config.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/config.class.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** config.class.php	10 Feb 2008 17:09:37 -0000	1.24
--- config.class.php	17 Feb 2008 08:31:36 -0000	1.25
***************
*** 401,405 ****
          }
          $t = new Template($_CONF['path_layout'] . 'admin/config');
!         $t->set_file(array('main' => 'configuration.thtml','menugroup' => 'menu_element.thtml'));
  
          $t->set_var('lang_save_changes', $LANG_CONFIG['save_changes']);
--- 401,411 ----
          }
          $t = new Template($_CONF['path_layout'] . 'admin/config');
!         $t->set_file(array('main' => 'configuration.thtml',
!                            'menugroup' => 'menu_element.thtml'));
! 
!         $t->set_var('site_url', $_CONF['site_url']);
!         $t->set_var('site_admin_url', $_CONF['site_admin_url']);
!         $t->set_var('layout_url', $_CONF['layout_url']);
!         $t->set_var('xhtml', XHTML);
  
          $t->set_var('lang_save_changes', $LANG_CONFIG['save_changes']);
***************
*** 407,412 ****
          $t->set_var('lang_changes_made', $LANG_CONFIG['changes_made']);
  
-         $t->set_var('xhtml', XHTML);
-         $t->set_var('site_url', $_CONF['site_url']);
          $t->set_var('open_group', $grp);
  
--- 413,416 ----
***************
*** 547,554 ****
          }
  
          $t->set_var('lang_restore', $LANG_CONFIG['restore']);
          $t->set_var('lang_add_element', $LANG_CONFIG['add_element']);
  
-         $t->set_var('xhtml', XHTML);
          $t->set_var('name', $name);
          $t->set_var('display_name', $display_name);
--- 551,562 ----
          }
  
+         $t->set_var('site_url', $_CONF['site_url']);
+         $t->set_var('site_admin_url', $_CONF['site_admin_url']);
+         $t->set_var('layout_url', $_CONF['layout_url']);
+         $t->set_var('xhtml', XHTML);
+ 
          $t->set_var('lang_restore', $LANG_CONFIG['restore']);
          $t->set_var('lang_add_element', $LANG_CONFIG['add_element']);
  
          $t->set_var('name', $name);
          $t->set_var('display_name', $display_name);