From e6a7be8b1f9531e35ecf3ed79553072bb2585418 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <bruederli@kolabsys.com>
Date: Thu, 04 Jul 2013 14:01:21 -0400
Subject: [PATCH] Don't add filters for required fields which are already in search filter
---
program/lib/Roundcube/rcube_ldap.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index 922c735..7c40023 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -871,6 +871,8 @@
// add required (non empty) fields filter
$req_filter = '';
foreach ((array)$required as $field) {
+ if (in_array($field, (array)$fields)) // required field is already in search filter
+ continue;
if ($attrs = $this->_map_field($field)) {
if (count($attrs) > 1)
$req_filter .= '(|';
--
Gitblit v1.9.1