[geeklog-cvs] Geeklog-1.x/public_html lib-common.php,1.694,1.695

[Dirk Haun]

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

Modified Files:
	lib-common.php 
Log Message:
Make sure the XHTML constant is defined in case the theme doesn't define it (cf. bug #0000622)


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.694
retrieving revision 1.695
diff -C2 -d -r1.694 -r1.695
*** lib-common.php	4 May 2008 21:50:11 -0000	1.694
--- lib-common.php	7 May 2008 18:48:17 -0000	1.695
***************
*** 327,333 ****
  // Include theme functions file which may/may not do anything
  
! if( file_exists( $_CONF['path_layout'] . 'functions.php' ))
! {
!     require_once( $_CONF['path_layout'] . 'functions.php' );
  }
  
--- 327,338 ----
  // Include theme functions file which may/may not do anything
  
! if (file_exists($_CONF['path_layout'] . 'functions.php')) {
!     require_once $_CONF['path_layout'] . 'functions.php';
! }
! 
! // ensure XHTML constant is defined to avoid problems elsewhere
! 
! if (!defined('XHTML')) {
!     define('XHTML', '');
  }
  
***************
*** 335,340 ****
  // fall back to 'gif' if they don't
  
! if( empty( $_IMAGE_TYPE ))
! {
      $_IMAGE_TYPE = 'gif';
  }
--- 340,344 ----
  // fall back to 'gif' if they don't
  
! if (empty($_IMAGE_TYPE)) {
      $_IMAGE_TYPE = 'gif';
  }