aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/auth/auth.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-08-07 12:44:10 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-08-07 12:44:10 +0200
commit28224bad70fe5c2d912d96f2f35e4e5d99301c71 (patch)
treef022b99cff7c80074c4f2e82d40e273b56f0a973 /phpBB/phpbb/auth/auth.php
parentf8046cc2533f9f87eb914564c4e0e1215b0f007f (diff)
parent2f44a865a01d1c9d1198484c7a9e841c22ef267d (diff)
downloadforums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar
forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.gz
forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.bz2
forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.tar.xz
forums-28224bad70fe5c2d912d96f2f35e4e5d99301c71.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12557] Fix load active module description [ticket/12557] Fix php file description [ticket/12557] Fix post data description for notifications [ticket/12557] Fix pass by reference doc blocks [ticket/12557] Fix doc block in extension base class [ticket/12557] Fix doc block in mimetype guesser [ticket/12557] Fix var $preserve_cr description [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Template fixes [ticket/12557] Search, cron and profilefields fixes [ticket/12557] Notification fixes [ticket/12557] Fix doc block errors found by Sami pt1 [ticket/12557] Fix doc block errors found by Sami [ticket/12557] Fix doc block errors found by Sami
Diffstat (limited to 'phpBB/phpbb/auth/auth.php')
-rw-r--r--phpBB/phpbb/auth/auth.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php
index 65249275d4..38755ccf99 100644
--- a/phpBB/phpbb/auth/auth.php
+++ b/phpBB/phpbb/auth/auth.php
@@ -208,9 +208,12 @@ class auth
/**
* Get forums with the specified permission setting
- * if the option is prefixed with !, then the result becomes negated
*
- * @param bool $clean set to true if only values needs to be returned which are set/unset
+ * @param string $opt The permission name to lookup. If prefixed with !, the result is negated.
+ * @param bool $clean set to true if only values needs to be returned which are set/unset
+ *
+ * @return array Contains the forum ids with the specified permission set to true.
+ This is a nested array: array => forum_id => permission => true
*/
function acl_getf($opt, $clean = false)
{