From 1ee4900a54b9aba69d115a5f4a513fef31655452 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 27 Apr 2013 17:12:48 +0400 Subject: [PATCH] fix startup_gettext() trying to get configured language before session is initialized --- include/functions.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/functions.php b/include/functions.php index 6337dbbd..5da657f2 100644 --- a/include/functions.php +++ b/include/functions.php @@ -95,8 +95,11 @@ $lang = _TRANSLATION_OVERRIDE_DEFAULT; } - if ($_SESSION["language"] && $_SESSION["language"] != "auto") { - $lang = $_SESSION["language"]; + // startup_gettext() is called before session_start() so we can't rely + // on $_SESSION['language'] here. + + if ($_COOKIE["ttrss_lang"] && $_COOKIE["ttrss_lang"] != "auto") { + $lang = $_COOKIE["ttrss_lang"]; } if ($lang) { -- 2.39.2