Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

diff --git a/include/functions.php b/include/functions.php
index 77725fa981dbc1d266ba05b8234a37a392cdeda0..2f288737ed4b6814ead1331889807107deccacfb 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -100,7 +100,7 @@
                if ($_SESSION["uid"] && get_schema_version() >= 120) {
                        $pref_lang = get_pref("USER_LANGUAGE", $_SESSION["uid"]);
 
-                       if ($pref_lang) {
+                       if ($pref_lang && $pref_lang != 'auto') {
                                $lang = $pref_lang;
                        }
                }