From 712875bde1b0f1d7d7b40422122ed6f9c7996c41 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Mon, 10 Apr 2017 13:22:09 +0200 Subject: [PATCH] Fix bug where base_dn setting was ignored inside group_filters (#5720) --- CHANGELOG | 1 + program/lib/Roundcube/rcube_ldap.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 663906b2c..c8f9d7567 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -30,6 +30,7 @@ CHANGELOG Roundcube Webmail - Fix bug where namespace prefix could not be truncated on folders list if show_real_foldernames=true (#5695) - Fix undesired effects when postgres database uses different timezone than PHP host (#5708) - Installer: Fix DB schema initialization on MS SQL Server +- Fix bug where base_dn setting was ignored inside group_filters (#5720) RELEASE 1.3-beta ---------------- diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php index 444ce05e2..e166df3b2 100644 --- a/program/lib/Roundcube/rcube_ldap.php +++ b/program/lib/Roundcube/rcube_ldap.php @@ -912,7 +912,7 @@ class rcube_ldap extends rcube_addressbook protected function extended_search($count = false) { $prop = $this->group_id ? $this->group_data : $this->prop; - $base_dn = $this->group_id ? $this->groups_base_dn : $this->base_dn; + $base_dn = $this->group_id ? $prop['base_dn'] : $this->base_dn; $attrs = $count ? array('dn') : $this->prop['attributes']; $entries = array();