-
-if(array_key_exists('system_language',$_POST)) {
- if(strlen($_POST['system_language']))
- $_SESSION['language'] = $_POST['system_language'];
- else
- unset($_SESSION['language']);
+if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
+ // we didn't loaded user data yet, but we need user language
+ $r = q("SELECT language FROM user WHERE uid=%d", intval($_SESSION['uid']));
+ $_SESSION['language'] = $lang;
+ if (dba::is_result($r)) $_SESSION['language'] = $r[0]['language'];