From 260efcc5a68590dd30ec601d0680feb6dc78f2da Mon Sep 17 00:00:00 2001
From: Jari Turkia <jmjt@jari.turkia.name>
Date: Sun, 10 Mar 2019 11:41:40 +0200
Subject: [PATCH] Make sure there is a $serendipity['lang'] defined by
 serendipity_getSessionLanguage()

---
 include/functions_config.inc.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 8c6b9675..dd089062 100644
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -1024,7 +1024,12 @@ function serendipity_getSessionLanguage() {
             if (isset($serendipity['COOKIE']['userDefLang']) && ! empty($serendipity['COOKIE']['userDefLang'])) {
                 $lang = $serendipity['COOKIE']['userDefLang'];
             } else {
-                $lang = $serendipity['lang'];
+                if ($serendipity['lang']) {
+                    $lang = $serendipity['lang'];
+                } else {
+                    // serendipity_load_configuration() failed to load language, go default
+                    $lang = $serendipity['autolang'];
+                }
             }
         }
         $serendipity['detected_lang'] = null;