From e59471fcb9f4e5e11a6d054e930a21b469f76f97 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 7 Jan 2014 09:48:55 +0100
Subject: Make sure prefs always is a valid array (otherwise causes fatal
 errors if language if not set)

---
 program/lib/Roundcube/rcube_user.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'program/lib/Roundcube/rcube_user.php')

diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php
index 1d5a90577..e232736c9 100644
--- a/program/lib/Roundcube/rcube_user.php
+++ b/program/lib/Roundcube/rcube_user.php
@@ -125,8 +125,10 @@ class rcube_user
      */
     function get_prefs()
     {
+        $prefs = array();
+
         if (!empty($this->language))
-            $prefs = array('language' => $this->language);
+            $prefs['language'] = $this->language;
 
         if ($this->ID) {
             // Preferences from session (write-master is unavailable)
-- 
cgit v1.2.3