[jan] Fix compatibility with PHP 5.3 (Bug #11888).

horde · Jun 13, 2014 · 66d8170 · 66d8170
1 parent d687c78
commit 66d8170
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/framework/Ldap/lib/Horde/Ldap.php b/framework/Ldap/lib/Horde/Ldap.php
@@ -1546,23 +1546,29 @@ public static function quote($clause)
      */
     public static function quoteDN($parts)
     {
-        return implode(
-            ',',
-            array_map(
-                function($attribute)
-                {
-                    if (is_array($attribute[0])) {
-                        return implode(
-                            '+',
-                            array_map('self::_quoteRDN', $attribute)
-                        );
-                    } else {
-                        return self::_quoteRDN($attribute);
-                    }
-                },
-                $parts
-            )
-        );
+        return implode(',', array_map('self::_quoteRDNs', $parts));
+    }
+
+    /**
+     * Takes a single or a list of RDN arrays with an attribute name and value
+     * and properly quotes it according to RFC 1485.
+     *
+     * @param array $attribute  A tuple or array of tuples containing the
+     *                          attribute name and that attribute's value which
+     *                          make up the RDN.
+     *
+     * @return string  The properly quoted string RDN.
+     */
+    protected static function _quoteRDNs($attribute)
+    {
+        if (is_array($attribute[0])) {
+            return implode(
+                '+',
+                array_map('self::_quoteRDN', $attribute)
+            );
+        } else {
+            return self::_quoteRDN($attribute);
+        }
     }
 
     /**

diff --git a/framework/Ldap/package.xml b/framework/Ldap/package.xml
@@ -28,6 +28,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/lgpl-3.0.html">LGPL-3.0</license>
  <notes>
+* [jan] Fix compatibility with PHP 5.3 (Bug #11888).
 * [jan] Allow to specify base DN for searching user DNs.
  </notes>
  <contents>
@@ -456,6 +457,7 @@
    <date>2014-06-11</date>
    <license uri="http://opensource.org/licenses/lgpl-3.0.html">LGPL-3.0</license>
    <notes>
+* [jan] Fix compatibility with PHP 5.3 (Bug #11888).
 * [jan] Allow to specify base DN for searching user DNs.
    </notes>
   </release>