diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-24 10:41:44 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-09-24 10:41:44 +0000 |
| commit | 5754ecad407a39583e813c081fc38a4ad6e438f0 (patch) | |
| tree | a8f7941350a2adf13418ff4242d234c73fe4d5ba | |
| parent | b2292de526806ee38031f1d653b5f57dde3b959a (diff) | |
- Fix language autodetection (#1485401)
git-svn-id: https://svn.roundcube.net/trunk@1888 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 7 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_user.php | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 9137398ca..b109156dd 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/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/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']); |