plugins/kolab_config

[Thomas Brüderli]

 plugins/kolab_config/kolab_config.php |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 16e0220b6cef53e753da5ecbe1c0e57c8e7eb72b
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed May 23 15:41:13 2012 +0200

    Take special language 'XX' into account (as specified in KEP:16)

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;
                     }