[geeklog-cvs] Geeklog-1.x/public_html/admin block.php, 1.117, 1.118 moderation.php, 1.117, 1.118 user.php, 1.199, 1.200

[Michael Jervis]

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

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

Index: block.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/block.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** block.php	16 Feb 2008 23:00:35 -0000	1.117
--- block.php	20 Feb 2008 20:07:58 -0000	1.118
***************
*** 101,104 ****
--- 101,105 ----
      $block_templates = new Template($_CONF['path_layout'] . 'admin/block');
      $block_templates->set_file('editor','defaultblockeditor.thtml');
+     $block_templates->set_var('xhtml', XHTML);
      $block_templates->set_var('site_url', $_CONF['site_url']);
      $block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
***************
*** 241,244 ****
--- 242,246 ----
      $block_templates->set_file('editor','blockeditor.thtml');
      $block_templates->set_var('site_url', $_CONF['site_url']);
+     $block_templates->set_var('xhtml', XHTML);
      $block_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
      $block_templates->set_var('layout_url', $_CONF['layout_url']);

Index: moderation.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/moderation.php,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** moderation.php	17 Feb 2008 10:29:36 -0000	1.117
--- moderation.php	20 Feb 2008 20:07:58 -0000	1.118
***************
*** 89,93 ****
                                         'ccrow'  => 'ccrow.thtml',
                                         'ccitem' => 'ccitem.thtml'));
!     $admin_templates->set_var( 'xhtml', XHTML );
  
      $retval .= COM_startBlock ('Geeklog ' . VERSION . ' -- ' . $LANG29[34], '',
--- 89,96 ----
                                         'ccrow'  => 'ccrow.thtml',
                                         'ccitem' => 'ccitem.thtml'));
!     $admin_templates->set_var('xhtml', XHTML);
!     $admin_templates->set_var('layout_url', $_CONF['layout_url']);
!     $admin_templates->set_var('site_url', $_CONF['site_url']);
!     $admin_templates->set_var('site_admin_url', $_CONF['site_admin_url']);
  
      $retval .= COM_startBlock ('Geeklog ' . VERSION . ' -- ' . $LANG29[34], '',

Index: user.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/user.php,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** user.php	9 Dec 2007 18:05:39 -0000	1.199
--- user.php	20 Feb 2008 20:07:58 -0000	1.200
***************
*** 701,705 ****
--- 701,707 ----
                                        'reminder' => 'reminder.thtml'));
      $user_templates->set_var ( 'xhtml', XHTML );
+     $user_templates->set_var ('site_url', $_CONF['site_url']);
      $user_templates->set_var ('site_admin_url', $_CONF['site_admin_url']);
+     $user_templates->set_var ('layout_url', $_CONF['layout_url']);
      $user_templates->set_var ('usr_type', $usr_type);
      $user_templates->set_var ('usr_time', $usr_time);