Merge branch 'fix-ldap-filter' of https://github.com/sgehrig/zf2 into…

… hotfix/ldap-filter-import
zendframework · Feb 9, 2012 · 1a88668 · 1a88668
2 parents 5d2013f + 8f8e24b
commit 1a88668
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Adapter/Ldap.php b/src/Adapter/Ldap.php
@@ -32,7 +32,7 @@
  * @uses       Zend\Authentication\Adapter
  * @uses       Zend\Ldap\Ldap
  * @uses       Zend\Ldap\Exception
- * @uses       Zend\Ldap\Filter\Filter
+ * @uses       Zend\Ldap\Filter
  * @category   Zend
  * @package    Zend_Authentication
  * @subpackage Adapter
@@ -447,9 +447,9 @@ protected function _checkGroupMembership(\Zend\Ldap\Ldap $ldap, $canonicalName,
             $user = $dn;
         }
 
-        $groupName   = \Zend\Ldap\Filter\Filter::equals($adapterOptions['groupAttr'], $adapterOptions['group']);
-        $membership  = \Zend\Ldap\Filter\Filter::equals($adapterOptions['memberAttr'], $user);
-        $group       = \Zend\Ldap\Filter\Filter::andFilter($groupName, $membership);
+        $groupName   = \Zend\Ldap\Filter::equals($adapterOptions['groupAttr'], $adapterOptions['group']);
+        $membership  = \Zend\Ldap\Filter::equals($adapterOptions['memberAttr'], $user);
+        $group       = \Zend\Ldap\Filter::andFilter($groupName, $membership);
         $groupFilter = $adapterOptions['groupFilter'];
         if (!empty($groupFilter)) {
             $group = $group->addAnd($groupFilter);