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

[dhaun at geeklog.net]

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

Modified Files:
	lib-common.php 
Log Message:
Should use PATH_SEPARATOR in the ini_set instead of trying to guess the correct separator. Also leave the '-' off of the site's title is $_CONF['site_slogan'] is empty (feature request #88).


Index: lib-common.php
===================================================================
RCS file: /usr/cvs/geeklog/geeklog-1.3/public_html/lib-common.php,v
retrieving revision 1.272
retrieving revision 1.273
diff -C2 -d -r1.272 -r1.273
*** lib-common.php	6 Jan 2004 15:24:49 -0000	1.272
--- lib-common.php	10 Jan 2004 13:44:45 -0000	1.273
***************
*** 9,13 ****
  // | Geeklog common library.                                                   |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2003 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
--- 9,13 ----
  // | Geeklog common library.                                                   |
  // +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2004 by the following authors:                         |
  // |                                                                           |
  // | Authors: Tony Bibbs        - tony at tonybibbs.com                           |
***************
*** 36,40 ****
  
  // Prevent PHP from reporting uninitialized variables
! error_reporting(E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR);
  
  /**
--- 36,40 ----
  
  // Prevent PHP from reporting uninitialized variables
! error_reporting( E_ERROR | E_WARNING | E_PARSE | E_COMPILE_ERROR );
  
  /**
***************
*** 171,174 ****
--- 171,175 ----
  * This is a poorly implemented class that was not very well thought out.
  * Still very necessary
+ *
  */
  
***************
*** 186,189 ****
--- 187,191 ----
  *
  */
+ 
  require_once( $_CONF['path_system'] . 'classes/kses.class.php' );
  
***************
*** 195,205 ****
  {
      $curPHPIncludePath = ini_get( 'include_path' );
-     $separator = ';';
-     if( strpos( $curPHPIncludePath, ';' ) === false )
-     {
-         $separator = ':';
-     }
      ini_set( 'include_path',
!              $curPHPIncludePath . $separator . $_CONF['path_pear'] );  
  }
  
--- 197,202 ----
  {
      $curPHPIncludePath = ini_get( 'include_path' );
      ini_set( 'include_path',
!              $curPHPIncludePath . PATH_SEPARATOR . $_CONF['path_pear'] );  
  }
  
***************
*** 776,787 ****
          ));
  
!     if( empty( $_CONF['pagetitle'] ))
      {
!         $header->set_var( 'page_title', $_CONF['site_name'] . ' - ' . $_CONF['site_slogan']);
      }
!     else
      {
!         $header->set_var( 'page_title', $_CONF['site_name'] . ' - ' . $_CONF['pagetitle']);
      }
  
      $header->set_var( 'background_image', $_CONF['layout_url'] . '/images/bg.gif' );
--- 773,786 ----
          ));
  
!     $pagetitle = $_CONF['pagetitle'];
!     if( empty( $pagetitle ))
      {
!         $pagetitle = $_CONF['site_slogan'];
      }
!     if( !empty( $pagetitle ))
      {
!         $pagetitle = ' - ' . $pagetitle;
      }
+     $header->set_var( 'page_title', $_CONF['site_name'] . $pagetitle );
  
      $header->set_var( 'background_image', $_CONF['layout_url'] . '/images/bg.gif' );