From 5754ecad407a39583e813c081fc38a4ad6e438f0 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Wed, 24 Sep 2008 10:41:44 +0000
Subject: - Fix language autodetection (#1485401)

git-svn-id: https://svn.roundcube.net/trunk@1888 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_user.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/rcube_user.php b/roundcubemail/program/include/rcube_user.php
index 97de97b37..8c77fdcf4 100644
--- a/roundcubemail/program/include/rcube_user.php
+++ b/roundcubemail/program/include/rcube_user.php
@@ -78,7 +78,8 @@ class rcube_user
    */
   function get_prefs()
   {
-    $prefs = array('language' => $this->language);
+    if (!empty($this->language))
+      $prefs = array('language' => $this->language);
     
     if ($this->ID && $this->data['preferences'])
       $prefs += (array)unserialize($this->data['preferences']);
-- 
cgit v1.2.3