[geeklog-cvs] Geeklog-1.x/system/classes navbar.class.php, 1.4, 1.5 search.class.php, 1.64, 1.65

[Michael Jervis]

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

Modified Files:
	navbar.class.php search.class.php 
Log Message:
Ensure every template class has site_url, site_admin_url, layout_url and xhtml variables set. My eyes, they bleed...

Index: search.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/search.class.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** search.class.php	16 Feb 2008 21:24:28 -0000	1.64
--- search.class.php	20 Feb 2008 20:07:59 -0000	1.65
***************
*** 530,534 ****
          $cur_plugin = new Plugin();
          $searchresults = new Template($_CONF['path_layout'] . 'search');
!         $searchresults->set_var( 'xhtml', XHTML );
  
          $maxdisplayed = 0;
--- 530,537 ----
          $cur_plugin = new Plugin();
          $searchresults = new Template($_CONF['path_layout'] . 'search');
!         $searchresults->set_var('xhtml', XHTML);
!         $searchresults->set_var('site_url', $_CONF['site_url']);
!         $searchresults->set_var('site_admin_url', $_CONF['site_admin_url']);
!         $searchresults->set_var('layout_url', $_CONF['layout_url']);
  
          $maxdisplayed = 0;
***************
*** 742,745 ****
--- 745,750 ----
          $login->set_var ('login_message', $LANG_LOGIN[2]);
          $login->set_var ('site_url', $_CONF['site_url']);
+         $login->set_var ('site_admin_url', $_CONF['site_admin_url']);
+         $login->set_var ('layout_url', $_CONF['layout_url']);
          $login->set_var ('lang_login', $LANG_LOGIN[3]);
          $login->set_var ('lang_newuser', $LANG_LOGIN[4]);
***************
*** 839,842 ****
--- 844,849 ----
          $searchform->set_var('search_intro', $LANG09[19]);
          $searchform->set_var('site_url', $_CONF['site_url']);
+         $searchform->set_var('site_admin_url', $_CONF['site_admin_url']);
+         $searchform->set_var('layout_url', $_CONF['layout_url']);
          $searchform->set_var('lang_keywords', $LANG09[2]);
          $searchform->set_var('lang_date', $LANG09[20]);

Index: navbar.class.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/system/classes/navbar.class.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** navbar.class.php	25 Nov 2007 06:59:56 -0000	1.4
--- navbar.class.php	20 Feb 2008 20:07:59 -0000	1.5
***************
*** 152,155 ****
--- 152,158 ----
  
          $navtemplate->set_var( 'xhtml', XHTML );
+         $navtemplate->set_var( 'site_url', $_CONF['site_url'] );
+         $navtemplate->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
+         $navtemplate->set_var( 'layout_url', $_CONF['layout_url'] );
          if ($this->_parms != '') {
              $navtemplate->set_var( 'parms',  $this->_parms);
***************
*** 190,193 ****
--- 193,199 ----
              'link'          => 'breadcrumb_link.thtml'));
          $this->_bctemplate->set_var( 'xhtml', XHTML );
+         $this->_bctemplate->set_var( 'site_url', $_CONF['site_url'] );
+         $this->_bctemplate->set_var( 'site_admin_url', $_CONF['site_admin_url'] );
+         $this->_bctemplate->set_var( 'layout_url', $_CONF['layout_url'] );
      }