[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.356,1.357

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv12702/public_html

Modified Files:
	lib-common.php 
Log Message:
Moved the code to add Geeklog's PEAR directory to the include path before the first attempt to use PEAR ...


Index: lib-common.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.356
retrieving revision 1.357
diff -C2 -d -r1.356 -r1.357
*** lib-common.php	9 Aug 2004 07:56:21 -0000	1.356
--- lib-common.php	11 Aug 2004 18:34:34 -0000	1.357
***************
*** 112,115 ****
--- 112,143 ----
  // | Library Includes: You shouldn't have to touch anything below here         |
  // +---------------------------------------------------------------------------+
+ 
+ /**
+ * If needed, add our PEAR path to the list of include paths
+ *
+ */
+ if( !$_CONF['have_pear'] )
+ {
+     $curPHPIncludePath = ini_get( 'include_path' );
+     if( defined( 'PATH_SEPARATOR' ))
+     {
+         $separator = PATH_SEPARATOR;
+     }
+     else
+     {
+         // prior to PHP 4.3.0, we have to guess the correct separator ...
+         $separator = ';';
+         if( strpos( $curPHPIncludePath, $separator ) === false )
+         {
+             $separator = ':';
+         }
+     }
+     if( ini_set( 'include_path', $_CONF['path_pear'] . $separator
+                                  . $curPHPIncludePath ) === false )
+     {
+         COM_errorLog( 'ini_set failed - there may be problems using the PEAR classes.', 1);
+     }
+ }
+ 
  /**
  * Include the PEAR Class to support PHP SESSIONS
***************
*** 117,123 ****
  */
  
! require_once ("HTTP/Session.php");
! HTTP_Session::useCookies($_CONF['sessions_usecookie']);
! HTTP_Session::start($_CONF['sessionid'], uniqid($_CONF['sessionid_prefex']));
  
  /**
--- 145,151 ----
  */
  
! require_once ('HTTP/Session.php');
! HTTP_Session::useCookies ($_CONF['sessions_usecookie']);
! HTTP_Session::start ($_CONF['sessionid'], uniqid ($_CONF['sessionid_prefex']));
  
  /**
***************
*** 206,235 ****
  require_once( $_CONF['path_system'] . 'classes/kses.class.php' );
  
- /**
- * If needed, add our PEAR path to the list of include paths
- *
- */
- if( !$_CONF['have_pear'] )
- {
-     $curPHPIncludePath = ini_get( 'include_path' );
-     if( defined( 'PATH_SEPARATOR' ))
-     {
-         $separator = PATH_SEPARATOR;
-     }
-     else
-     {
-         // prior to PHP 4.3.0, we have to guess the correct separator ...
-         $separator = ';';
-         if( strpos( $curPHPIncludePath, $separator ) === false )
-         {
-             $separator = ':';
-         }
-     }
-     if( ini_set( 'include_path', $_CONF['path_pear'] . $separator
-                                  . $curPHPIncludePath ) === false )
-     {
-         COM_errorLog( 'ini_set failed - there may be problems using the PEAR classes.', 1);
-     }
- }
  
  // Set theme
--- 234,237 ----