X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=8b0bd472513fd9c5a1ca9bbd457a60ce963682d3;hb=8c2efa6df43c3895eb571869621fb7687bdfc404;hp=8d40dbf85f2dfbfca4d8657c1e4053cd33068485;hpb=9d0f18c0b334aa325e624cf40d13f59bf32d0568;p=friendica.git

diff --git a/index.php b/index.php
index 8d40dbf85f..8b0bd47251 100644
--- a/index.php
+++ b/index.php
@@ -92,11 +92,13 @@ if (!$a->is_backend()) {
  * We have to do it here because the session was just now opened.
  */
 if (x($_SESSION, 'authenticated') && !x($_SESSION, 'language')) {
-	// we haven't loaded user data yet, but we need user language
-	$user = DBA::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
 	$_SESSION['language'] = $lang;
-	if (DBA::isResult($user)) {
-		$_SESSION['language'] = $user['language'];
+	// we haven't loaded user data yet, but we need user language
+	if (!empty($_SESSION['uid'])) {
+		$user = DBA::selectFirst('user', ['language'], ['uid' => $_SESSION['uid']]);
+		if (DBA::isResult($user)) {
+			$_SESSION['language'] = $user['language'];
+		}
 	}
 }
 
@@ -105,7 +107,7 @@ if (x($_SESSION, 'language') && ($_SESSION['language'] !== $lang)) {
 	L10n::loadTranslationTable($lang);
 }
 
-if ((x($_GET,'zrl')) && $a->mode == App::MODE_NORMAL) {
+if (!empty($_GET['zrl']) && $a->mode == App::MODE_NORMAL) {
 	$a->query_string = Profile::stripZrls($a->query_string);
 	if (!local_user()) {
 		// Only continue when the given profile link seems valid