[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.665,1.666

[Dirk Haun]

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

Modified Files:
	lib-common.php 
Log Message:
Patch by Joe Mucchiello for places in the code where the template library was used incorrectly


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.665
retrieving revision 1.666
diff -C2 -d -r1.665 -r1.666
*** lib-common.php	25 Nov 2007 09:11:11 -0000	1.665
--- lib-common.php	25 Nov 2007 15:09:08 -0000	1.666
***************
*** 979,995 ****
      $header->set_var( 'site_name', $_CONF['site_name']);
  
-     if( isset( $_CONF['advanced_editor'] ) && ( $_CONF['advanced_editor'] == 1 )
-             && file_exists( $_CONF['path_layout']
-                             . 'advanced_editor_header.thtml' ))
-     {
-         $header->set_file( 'editor'  , 'advanced_editor_header.thtml');
-         $header->parse( 'advanced_editor', 'editor' );
- 
-     }
-     else
-     {
-          $header->set_var( 'advanced_editor', '' );
-     }
- 
      $langAttr = '';
      if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files'] ))
--- 979,982 ----
***************
*** 1202,1205 ****
--- 1189,1205 ----
              $header->parse( 'right_blocks', 'rightblocks', true );
          }
+     }
+ 
+     if( isset( $_CONF['advanced_editor'] ) && ( $_CONF['advanced_editor'] == 1 )
+             && file_exists( $_CONF['path_layout']
+                             . 'advanced_editor_header.thtml' ))
+     {
+         $header->set_file( 'editor'  , 'advanced_editor_header.thtml');
+         $header->parse( 'advanced_editor', 'editor' );
+ 
+     }
+     else
+     {
+          $header->set_var( 'advanced_editor', '' );
      }