[Phpgroupware-cvs] CVS: sitemgr/sitemgr-site/inc class.bo.inc.php,1.6.2.3,1.6.2.4

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc
In directory subversions:/tmp/cvs-serv21541

Modified Files:
      Tag: Version-0_9_14-branch
        class.bo.inc.php 
Log Message:
variable userlang used twice could cause error when determining session language

Index: class.bo.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/sitemgr-site/inc/class.bo.inc.php,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -r1.6.2.3 -r1.6.2.4
*** class.bo.inc.php    22 Nov 2002 06:05:28 -0000      1.6.2.3
--- class.bo.inc.php    26 Nov 2002 23:10:25 -0000      1.6.2.4
***************
*** 406,410 ****
                                if (in_array($value,$supportedLanguages))
                                {
!                                       $userlang = $value;
                                        break;
                                }
--- 406,410 ----
                                if (in_array($value,$supportedLanguages))
                                {
!                                       $browserlang = $value;
                                        break;
                                }
***************
*** 412,422 ****
  
                        // no usersupported language found -> return the first 
entry of sitelanguages
!                       if (empty($userlang))
                        {
!                               $userlang = $supportedLanguages[0];
                        }
                    
!                       
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = $userlang;
!                       
$GLOBALS['phpgw']->session->appsession('language','sitemgr-site',$userlang);
                }
  
--- 412,422 ----
  
                        // no usersupported language found -> return the first 
entry of sitelanguages
!                       if (empty($browserlang))
                        {
!                               $browserlang = $supportedLanguages[0];
                        }
                    
!                       
$GLOBALS['phpgw_info']['user']['preferences']['common']['lang'] = $browserlang;
!                       
$GLOBALS['phpgw']->session->appsession('language','sitemgr-site',$browserlang);
                }