diff options
| author | n-aleha <nick_aleha@myway.com> | 2014-05-24 16:55:52 +0300 |
|---|---|---|
| committer | n-aleha <nick_aleha@myway.com> | 2014-08-03 07:13:20 +0300 |
| commit | 95ec9590dfd2e93a75383745f385aaa3493ed857 (patch) | |
| tree | f10ec7c16d0cbf9411f1e07d8fc076eebbdd8bc6 /phpBB | |
| parent | 6ac8d17af66900c87b4524c92e0cc26535ded7b0 (diff) | |
| download | forums-95ec9590dfd2e93a75383745f385aaa3493ed857.tar forums-95ec9590dfd2e93a75383745f385aaa3493ed857.tar.gz forums-95ec9590dfd2e93a75383745f385aaa3493ed857.tar.bz2 forums-95ec9590dfd2e93a75383745f385aaa3493ed857.tar.xz forums-95ec9590dfd2e93a75383745f385aaa3493ed857.zip | |
[ticket/12557] Fix doc block errors found by Sami
PHPBB3-12557
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_upload.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/auth/auth.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/session.php | 8 |
3 files changed, 9 insertions, 8 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index be4bedd2ca..04516ace9d 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -500,8 +500,8 @@ class fileupload * @param int $min_height Minimum image height (only checked for images) * @param int $max_width Maximum image width (only checked for images) * @param int $max_height Maximum image height (only checked for images) - * @param bool|array $disallowed_content If enabled, the first 256 bytes of the file must not contain any of it's values. - * Defaults to false. + * @param bool|array $disallowed_content If enabled, the first 256 bytes of the file must not + * contain any of its values. Defaults to false. * */ function fileupload($error_prefix = '', $allowed_extensions = false, $max_filesize = false, $min_width = false, $min_height = false, $max_width = false, $max_height = false, $disallowed_content = false) 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) |