summaryrefslogtreecommitdiff
path: root/include/functions.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/functions.php')
-rw-r--r--include/functions.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/functions.php b/include/functions.php
index 6337dbbde..5da657f2d 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) {