summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2012-05-23 13:41:13 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2012-05-23 13:41:13 (GMT)
commit16e0220b6cef53e753da5ecbe1c0e57c8e7eb72b (patch)
treea89f0f55a325e87e81ff13645e01993b92471180
parent7d1882ad7636c900232cbee369b4d702d0d9489f (diff)
downloadroundcubemail-plugins-kolab-16e0220b6cef53e753da5ecbe1c0e57c8e7eb72b.tar.gz
Take special language 'XX' into account (as specified in KEP:16)
-rw-r--r--plugins/kolab_config/kolab_config.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/kolab_config/kolab_config.php b/plugins/kolab_config/kolab_config.php
index 518c001..3433056 100644
--- a/plugins/kolab_config/kolab_config.php
+++ b/plugins/kolab_config/kolab_config.php
@@ -168,15 +168,14 @@ class kolab_config extends rcube_plugin
continue;
foreach ((array)$folder->select($query) as $object) {
- if ($object['type'] == 'dictionary' && $object['language'] == $lang) {
-
+ if ($object['type'] == 'dictionary' && ($object['language'] == $lang || $object['language'] == 'XX')) {
if (is_array($this->dicts[$lang]))
$this->dicts[$lang]['e'] = array_merge((array)$this->dicts[$lang]['e'], $object['e']);
else
$this->dicts[$lang] = $object;
// make sure the default object is cached
- if ($folder->default) {
+ if ($folder->default && $object['language'] != 'XX') {
$object['e'] = $this->dicts[$lang]['e'];
$this->dicts[$lang] = $object;
}