[Phpgroupware-cvs] phpgwapi/inc class.translation_sql.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Changes by:     Sigurd Nes <sigurdne>   06/07/05 13:12:40

Modified files:
        inc            : class.translation_sql.inc.php 

Log message:
        ability to turn off loading from shm

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.translation_sql.inc.php?cvsroot=phpgwapi&r1=1.22&r2=1.23

Patches:
Index: class.translation_sql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.translation_sql.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- class.translation_sql.inc.php       5 Jul 2006 12:40:43 -0000       1.22
+++ class.translation_sql.inc.php       5 Jul 2006 13:12:40 -0000       1.23
@@ -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.22 2006/07/05 
12:40:43 sigurdne Exp $
+       * @version $Id: class.translation_sql.inc.php,v 1.23 2006/07/05 
13:12:40 sigurdne Exp $
        */
 
        /**
@@ -39,6 +39,8 @@
                                $userlang = 'en';
                        }
 
+                       if($GLOBALS['phpgw_info']['server']['shm_lang'] && 
function_exists('sem_get'))
+                       {
                        if ( !is_array($GLOBALS['lang']) || $reset) //This 
should avoid problems for php-nuke & postnuke I guess (Caeies)
                        {
                                if($GLOBALS['lang'] = 
$GLOBALS['phpgw']->shm->get_value('lang_' . $userlang))
@@ -51,6 +53,11 @@
                                }
                        }
                }
+                       elseif(!is_array($GLOBALS['lang']))
+                       {
+                               $GLOBALS['lang'] = array();
+                       }
+               }
                
                function populate_shm()
                {