From bcdba37a829ba646747a31cbd25646fd52660f00 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
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 483816c0d..24ad32fcc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Fix regression in LDAP fuzzy search where it always used prefix search instead (#5713)
+- Fix bug where base_dn setting was ignored inside group_filters (#5720)
 
 RELEASE 1.1.8
 -------------
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 05dfbf7cc..bd200a3af 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -899,7 +899,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();