aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/auth/auth.php5
-rw-r--r--phpBB/phpbb/session.php8
2 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php
index ecc981eb9f..38755ccf99 100644
--- a/phpBB/phpbb/auth/auth.php
+++ b/phpBB/phpbb/auth/auth.php
@@ -209,10 +209,11 @@ class auth
/**
* Get forums with the specified permission setting
*
- * @param string $opt The permission name to lookup. If it's prefixed with !, then the result becomes negated.
+ * @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 permision set to true.
+ * @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)
{
diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php
index bfcd3368fa..5a0d7c0031 100644
--- a/phpBB/phpbb/session.php
+++ b/phpBB/phpbb/session.php
@@ -1064,10 +1064,10 @@ class session
* Checks whether the supplied user is banned by id, ip or email. If no parameters
* are passed to the method pre-existing session data is used.
*
- * @param int|false $user_id The user id
- * @param string|array|false $user_ips Can contain a string with one IP or an array of multiple IPs
- * @param string|false $user_email The user email
- * @param bool $return If $return is false this routine does not return on finding a banned user,
+ * @param int|false $user_id The user id
+ * @param mixed $user_ips Can contain a string with one IP or an array of multiple IPs
+ * @param string|false $user_email The user email
+ * @param bool $return If $return is false this routine does not return on finding a banned user,
* it outputs a relevant message and stops execution.
*/
function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false)