[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.649,1.650

[Dirk Haun]

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

Modified Files:
	lib-common.php 
Log Message:
Fixed comment (no more editing necessary); removed carriage returns


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.649
retrieving revision 1.650
diff -C2 -d -r1.649 -r1.650
*** lib-common.php	29 Aug 2007 02:11:34 -0000	1.649
--- lib-common.php	1 Sep 2007 15:26:04 -0000	1.650
***************
*** 84,100 ****
  }
  
! /**
! * Configuration Include: You should ONLY have to modify this line.
! * Leave the rest of this file intact!
! *
! * Make sure to include the name of the config file,
! * i.e. the path should end in .../config.php
  */
! require_once('siteconfig.php');
! require_once( $_CONF['path_system'] . 'classes/config.class.php'); 
! $config = config::create();
! $config->set_configfile($_CONF['path'] . 'db-config.php');
! $config->load_baseconfig();
! $_CONF =& $config->initConfig();
  
  // Before we do anything else, check to ensure site is enabled
--- 84,97 ----
  }
  
! /*
! * Configuration Include:
! * You do NOT need to modify anything here any more!
  */
! require_once 'siteconfig.php' ;
! require_once $_CONF['path_system'] . 'classes/config.class.php';
! $config = config::create();
! $config->set_configfile($_CONF['path'] . 'db-config.php');
! $config->load_baseconfig();
! $_CONF =& $config->initConfig();
  
  // Before we do anything else, check to ensure site is enabled
***************
*** 2373,2387 ****
          }
  
!         if (SEC_inGroup( 'Root' )) {
!             $url = $_CONF['site_admin_url'] . '/configuration.php';
!             $adminmenu->set_var( 'option_url', $url);
!             $adminmenu->set_var( 'option_label', $LANG01[129] );
!             $adminmenu->set_var( 'option_count', 'N/A');
!             $menu_item = $adminmenu->parse( 'item',
!                                             ( $thisUrl == $url ) ? 'current' :
!                                             'option' );
!             $link_array[$LANG01[129]] = $menu_item;
! 
!         }
  
  
--- 2370,2384 ----
          }
  
!         if (SEC_inGroup( 'Root' )) {
!             $url = $_CONF['site_admin_url'] . '/configuration.php';
!             $adminmenu->set_var( 'option_url', $url);
!             $adminmenu->set_var( 'option_label', $LANG01[129] );
!             $adminmenu->set_var( 'option_count', 'N/A');
!             $menu_item = $adminmenu->parse( 'item',
!                                             ( $thisUrl == $url ) ? 'current' :
!                                             'option' );
!             $link_array[$LANG01[129]] = $menu_item;
! 
!         }