[geeklog-cvs] geeklog-1.3/public_html lib-common.php,1.273,1.274

dhaun at geeklog.net dhaun at geeklog.net
Tue Jan 13 15:00:43 EST 2004


Update of /usr/cvs/geeklog/geeklog-1.3/public_html
In directory geeklog_prod:/tmp/cvs-serv28105

Modified Files:
	lib-common.php 
Log Message:
Workaround for the problems with PEAR classes (especially Mail) on case-sensitive file systems.


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.273
retrieving revision 1.274
diff -C2 -d -r1.273 -r1.274
*** lib-common.php	10 Jan 2004 13:44:45 -0000	1.273
--- lib-common.php	13 Jan 2004 20:00:40 -0000	1.274
***************
*** 197,202 ****
  {
      $curPHPIncludePath = ini_get( 'include_path' );
!     ini_set( 'include_path',
!              $curPHPIncludePath . PATH_SEPARATOR . $_CONF['path_pear'] );  
  }
  
--- 197,205 ----
  {
      $curPHPIncludePath = ini_get( 'include_path' );
!     if( ini_set( 'include_path', $_CONF['path_pear'] . PATH_SEPARATOR
!                                  . $curPHPIncludePath ) === false )
!     {
!         COM_errorLog( 'ini_set failed - there may be problems using the PEAR classes.', 1);
!     }
  }
  
***************
*** 1408,1412 ****
  * @param        string      $logentry       Text to log to error log
  * @param        int         $actionid       1 = write to log file, 2 = write to screen (default) both
! * @see function COM_accesslog
  * @return   string  If $actionid = 2 or '' then HTML formated string (wrapped in block) else nothing
  *
--- 1411,1415 ----
  * @param        string      $logentry       Text to log to error log
  * @param        int         $actionid       1 = write to log file, 2 = write to screen (default) both
! * @see function COM_accessLog
  * @return   string  If $actionid = 2 or '' then HTML formated string (wrapped in block) else nothing
  *
***************
*** 1480,1484 ****
  */
  
! function COM_accesslog( $logentry )
  {
      global $_CONF, $LANG01;
--- 1483,1487 ----
  */
  
! function COM_accessLog( $logentry )
  {
      global $_CONF, $LANG01;
***************
*** 5162,5169 ****
  
  // Now include all plugin functions
! $result = DB_query( "SELECT pi_name FROM {$_TABLES["plugins"]} WHERE pi_enabled = 1" );
  $nrows = DB_numRows( $result );
  
! for( $i = 1; $i <= $nrows; $i++ )
  {
      $A = DB_fetchArray( $result );
--- 5165,5172 ----
  
  // Now include all plugin functions
! $result = DB_query( "SELECT pi_name FROM {$_TABLES['plugins']} WHERE pi_enabled = 1" );
  $nrows = DB_numRows( $result );
  
! for( $i = 0; $i < $nrows; $i++ )
  {
      $A = DB_fetchArray( $result );





More information about the geeklog-cvs mailing list