X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=9fe248e8e2b5329f3b67503a75c74e9a2bc6ef3b;hb=ca201476b66dd50d8104b59214cd1922771f03ba;hp=949ccd532be9701ff77add799fcef881c8744fcc;hpb=ae172a9cec404ef9a0e9f16aafea97dea64d33ab;p=friendica.git

diff --git a/index.php b/index.php
index 949ccd532b..9fe248e8e2 100644
--- a/index.php
+++ b/index.php
@@ -53,12 +53,12 @@ if(!$install) {
 	load_config('config');
 	load_config('system');
 
-	$maxsysload = intval(get_config('system','maxloadavg'));
-	if($maxsysload < 1)
-		$maxsysload = 50;
+	$maxsysload_frontend = intval(get_config('system','maxloadavg_frontend'));
+	if($maxsysload_frontend < 1)
+		$maxsysload_frontend = 50;
 	if(function_exists('sys_getloadavg')) {
 		$load = sys_getloadavg();
-		if(intval($load[0]) > $maxsysload) {
+		if(intval($load[0]) > $maxsysload_frontend) {
 			logger('system: load ' . $load[0] . ' too high. Service Temporarily Unavailable.');
 			header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
 			header('Retry-After: 300');
@@ -102,13 +102,13 @@ session_start();
  * Language was set earlier, but we can over-ride it in the session.
  * We have to do it here because the session was just now opened.
  */
-
-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 (count($r)>0) $_SESSION['language'] = $r[0]['language'];
 }
+
 if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	$lang = $_SESSION['language'];
 	load_translation_table($lang);
@@ -129,7 +129,6 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
  *
  * What we really need to do is output the raw headers ourselves so we can keep them separate.
  *
-
  */
 
 // header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');