[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.translation_sql.inc.php
From: |
Dave Hall |
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.translation_sql.inc.php |
Date: |
Sat, 09 Sep 2006 11:46:07 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Changes by: Dave Hall <skwashd> 06/09/09 11:46:07
Modified files:
inc : class.translation_sql.inc.php
Log message:
notices
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.translation_sql.inc.php?cvsroot=phpgwapi&r1=1.26&r2=1.27
Patches:
Index: class.translation_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.translation_sql.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- class.translation_sql.inc.php 3 Sep 2006 06:15:27 -0000 1.26
+++ class.translation_sql.inc.php 9 Sep 2006 11:46:07 -0000 1.27
@@ -7,7 +7,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage application
- * @version $Id: class.translation_sql.inc.php,v 1.26 2006/09/03
06:15:27 skwashd Exp $
+ * @version $Id: class.translation_sql.inc.php,v 1.27 2006/09/09
11:46:07 skwashd Exp $
*/
/**
@@ -104,7 +104,8 @@
$userlang = 'en';
}
- if(!is_array($GLOBALS['lang']) ||
(!array_key_exists(strtolower(trim(substr($key,0,MAX_MESSAGE_ID_LENGTH))),$GLOBALS['lang'])
&& !$this->loaded_from_shm) ) //Using array_key_exists permits empty string
... Ugly but ... (Caeies)
+ if ( !isset($GLOBALS['lang']) ||
!is_array($GLOBALS['lang'])
+ ||
(!array_key_exists(strtolower(trim(substr($key,0,MAX_MESSAGE_ID_LENGTH))),$GLOBALS['lang'])
&& !$this->loaded_from_shm) ) //Using array_key_exists permits empty string
... Ugly but ... (Caeies)
{
$sql = "SELECT message_id,content FROM
phpgw_lang WHERE lang = '".$userlang."' ".
"AND message_id =
'".$GLOBALS['phpgw']->db->db_addslashes($key)."' OR message_id = 'charset' AND
(app_name = '".$GLOBALS['phpgw_info']['flags']['currentapp']."' OR app_name =
'common' or app_name = 'all')";
- [Phpgroupware-cvs] phpgwapi/inc class.translation_sql.inc.php,
Dave Hall <=