[Pkg-owncloud-commits] [owncloud] 05/21: fix PHPdoc

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch 6.0
in repository owncloud.

commit e23e459c41f88d97388d52fa0890139a6c60b0a6
Author: Arthur Schiwon <blizzz at owncloud.com>
Date:   Wed Jun 11 21:37:23 2014 +0200

    fix PHPdoc
---
 apps/user_ldap/lib/access.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index fef222f..5a5f2d3 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1028,11 +1028,11 @@ class Access extends LDAPUtility {
 	}
 
 	/**
-	 * @brief combines the input filters with AND
+	 * combines the input filters with OR
 	 * @param $filters array, the filters to connect
 	 * @returns the combined filter
 	 *
-	 * Combines Filter arguments with AND
+	 * Combines Filter arguments with OR
 	 */
 	public function combineFilterWithOr($filters) {
 		return $this->combineFilter($filters, '|');

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git