From 1518888efa3ef05f87709a98af3e62c0a63e4543 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <brenard@easter-eggs.com>
Date: Fri, 28 Nov 2014 16:16:30 +0100
Subject: [PATCH] LSldap : combineFilters() : fix  parameter support when 
 array contain only one filter

---
 public_html/includes/class/class.LSldap.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/public_html/includes/class/class.LSldap.php b/public_html/includes/class/class.LSldap.php
index 8b3de809..43cf14c5 100644
--- a/public_html/includes/class/class.LSldap.php
+++ b/public_html/includes/class/class.LSldap.php
@@ -452,7 +452,12 @@ class LSldap {
   public static function combineFilters($op,$filters,$asStr=false) {
     if (is_array($filters) && !empty($filters)) {
       if (count($filters)==1) {
-        return $filters[0];
+        if ($asStr && $filters[0] instanceof Net_LDAP2_Filter) {
+          return $filters[0]->asString();
+        }
+        else {
+          return $filters[0];
+        }
       }
       $filter=Net_LDAP2_Filter::combine($op,$filters);
       if (!Net_LDAP2::isError($filter)) {