diff options
author | Lukas Reschke <lukas@owncloud.com> | 2015-02-24 16:37:49 +0100 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2015-02-24 16:37:49 +0100 |
commit | 52495dc99585a88137f628ddc2a2fc8d20583396 (patch) | |
tree | 5487fbf81838e77a10d6176e8480b04d0b017184 /apps/user_ldap/lib/connection.php | |
parent | b6289542e8e1e7bbadc67fee377f7af5cd29e2bb (diff) | |
parent | 73600cfdd80694a9ffa526147d79b231fd85c5b2 (diff) | |
download | nextcloud-server-52495dc99585a88137f628ddc2a2fc8d20583396.tar.gz nextcloud-server-52495dc99585a88137f628ddc2a2fc8d20583396.zip |
Merge pull request #13740 from owncloud/fix-12190-2
Include primary groups in user and login filter when restricting group access and also fix user counting in primary groups
Diffstat (limited to 'apps/user_ldap/lib/connection.php')
-rw-r--r-- | apps/user_ldap/lib/connection.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index f3e36fbbf26..4434780ce0b 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -38,6 +38,7 @@ namespace OCA\user_ldap\lib; * @property boolean hasPagedResultSupport * @property string[] ldapBaseUsers * @property int|string ldapPagingSize holds an integer + * @property bool|mixed|void ldapGroupMemberAssocAttr */ class Connection extends LDAPUtility { private $ldapConnectionRes = null; |