extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

missing part of the patch for 1.4

Browse Source
This commit is contained in:
Ralf Becker 2010-03-08 06:44:27 +00:00
parent 84888a119b
commit 494d31e47a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
login.php
View File

@ -237,7 +237,7 @@
$remember_time,'/'); // make the cookie valid for the whole site (incl. sitemgr) and not only the eGW install-dir $remember_time,'/'); // make the cookie valid for the whole site (incl. sitemgr) and not only the eGW install-dir
} }
if ($_POST['lang'] && preg_match('/^[a-z]{2}(-[a-z]{2}){0,1}$/',$_POST['lang']) && if ($_POST['lang'] && preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$_POST['lang']) &&
$_POST['lang'] != $GLOBALS['egw_info']['user']['preferences']['common']['lang']) $_POST['lang'] != $GLOBALS['egw_info']['user']['preferences']['common']['lang'])
{ {
$GLOBALS['egw']->preferences->add('common','lang',$_POST['lang'],'session'); $GLOBALS['egw']->preferences->add('common','lang',$_POST['lang'],'session');
@ -296,7 +296,7 @@
$GLOBALS['egw_info']['user']['preferences'] = $prefs->read_repository(); $GLOBALS['egw_info']['user']['preferences'] = $prefs->read_repository();
} }
} }
if ($_GET['lang']) if ($_GET['lang'] && preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$_GET['lang']))
{ {
$GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $_GET['lang']; $GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $_GET['lang'];
} }