From d6869a66938db760a6b10990f0dbccc81347ffb3 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 24 Sep 2008 06:41:44 -0400
Subject: [PATCH] - Fix language autodetection (#1485401)
---
CHANGELOG | 7 +++++++
program/include/rcube_user.php | 3 ++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9137398..b109156 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,13 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/09/23 (alec)
+----------
+- Fix language autodetection (#1485401)
+- Fix button label in folders management (#1485405)
+- Fix collapsed folder not indicating unread msgs count of all subfolders (#1485403)
+- Fix handling of apostrophes in filenames decoded according to rfc2231
+
2008/09/19 (thomasb)
----------
- Made config files location configurable (#1485215)
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 97de97b..8c77fdc 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -78,7 +78,8 @@
*/
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']);
--
Gitblit v1.9.1