maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Fixing login - languageselector, fixes #277

Browse Source
This commit is contained in:
Florian Aders (EleRas)
2010-06-16 16:26:31 +00:00
parent cc7610d436
commit a1c98e4012
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/init.php
View File

@@ -265,6 +265,13 @@ foreach($langs as $key => $value)
$languages[$key] = $key; $languages[$key] = $key;
} }
if (isset($userinfo['language']))
{
// default: use language from session, #277
$language = $userinfo['language'];
}
else
{
if(!isset($userinfo['def_language']) if(!isset($userinfo['def_language'])
|| !isset($languages[$userinfo['def_language']])) || !isset($languages[$userinfo['def_language']]))
{ {
@@ -282,6 +289,7 @@ else
{ {
$language = $userinfo['def_language']; $language = $userinfo['def_language'];
} }
}
// include every english language file we can get // include every english language file we can get