Aleksander Machniak
2015-01-21 bf99c50cc18d3bf35f85f5b3b09293f27605b1d2
Fix bug where empty fieldmap config entries caused empty results of ldap search (#1490229)
2 files modified
4 ■■■ changed files
CHANGELOG 1 ●●●● patch | view | raw | blame | history
program/lib/Roundcube/rcube_ldap.php 3 ●●●● patch | view | raw | blame | history
CHANGELOG
@@ -12,6 +12,7 @@
- Fix bug where search was reset after returning from compose visited for reply
- Fix javascript error in "IE 8.0/Tablet PC" browser (#1490210)
- Fix bug where Reply-To address was ignored on reply to messages sent by self (#1490233)
- Fix bug where empty fieldmap config entries caused empty results of ldap search (#1490229)
RELEASE 1.1-rc
--------------
program/lib/Roundcube/rcube_ldap.php
@@ -117,13 +117,14 @@
        // fieldmap property is given
        if (is_array($p['fieldmap'])) {
            $p['fieldmap'] = array_filter($p['fieldmap']);
            foreach ($p['fieldmap'] as $rf => $lf)
                $this->fieldmap[$rf] = $this->_attr_name(strtolower($lf));
        }
        else if (!empty($p)) {
            // read deprecated *_field properties to remain backwards compatible
            foreach ($p as $prop => $value)
                if (preg_match('/^(.+)_field$/', $prop, $matches))
                if (!empty($value) && preg_match('/^(.+)_field$/', $prop, $matches))
                    $this->fieldmap[$matches[1]] = $this->_attr_name(strtolower($value));
        }