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

Dirk Haun dhaun at qs1489.pair.com
Sat Sep 1 16:23:47 EDT 2007


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

Modified Files:
	lib-common.php 
Log Message:
Use !empty() instead of isset() to avoid error.log being filled with warnings about incorrect multi-language settings


Index: lib-common.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/lib-common.php,v
retrieving revision 1.650
retrieving revision 1.651
diff -C2 -d -r1.650 -r1.651
*** lib-common.php	1 Sep 2007 15:26:04 -0000	1.650
--- lib-common.php	1 Sep 2007 20:23:45 -0000	1.651
***************
*** 353,357 ****
      }
  }
! else if( isset( $_CONF['languages'] ) && isset( $_CONF['language_files'] ))
  {
      $_CONF['language'] = COM_getLanguage();
--- 353,357 ----
      }
  }
! else if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files'] ))
  {
      $_CONF['language'] = COM_getLanguage();
***************
*** 977,981 ****
  
      $langAttr = '';
!     if( isset( $_CONF['languages'] ) && isset( $_CONF['language_files'] ))
      {
          $langId = COM_getLanguageId();
--- 977,981 ----
  
      $langAttr = '';
!     if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files'] ))
      {
          $langId = COM_getLanguageId();
***************
*** 6027,6031 ****
      $sql = '';
  
!     if( isset( $_CONF['languages'] ) && isset( $_CONF['language_files'] ))
      {
          if( !empty( $table ))
--- 6027,6031 ----
      $sql = '';
  
!     if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files'] ))
      {
          if( !empty( $table ))
***************
*** 6059,6063 ****
      $retval = '';
  
!     if( !isset( $_CONF['languages'] ) || !isset( $_CONF['language_files'] ) ||
            ( count( $_CONF['languages'] ) != count( $_CONF['language_files'] )))
      {
--- 6059,6063 ----
      $retval = '';
  
!     if( empty( $_CONF['languages'] ) || empty( $_CONF['language_files'] ) ||
            ( count( $_CONF['languages'] ) != count( $_CONF['language_files'] )))
      {
***************
*** 6124,6128 ****
      global $_CONF;
  
!     if( isset( $_CONF['languages'] ) && isset( $_CONF['language_files'] ))
      {
          $overridables = array
--- 6124,6128 ----
      global $_CONF;
  
!     if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files'] ))
      {
          $overridables = array




More information about the geeklog-cvs mailing list