diff options
| author | battye <battye@phpbb.com> | 2019-01-04 15:49:15 +0000 |
|---|---|---|
| committer | battye <battye@phpbb.com> | 2019-01-04 15:49:15 +0000 |
| commit | 3f19d32f768974454046f744f126515fb3747b99 (patch) | |
| tree | b2b2c427d40ec779886f471411d6f2375d13253c | |
| parent | 565f6925410b1022529670d47f3b00c244ccaed7 (diff) | |
| download | forums-3f19d32f768974454046f744f126515fb3747b99.tar forums-3f19d32f768974454046f744f126515fb3747b99.tar.gz forums-3f19d32f768974454046f744f126515fb3747b99.tar.bz2 forums-3f19d32f768974454046f744f126515fb3747b99.tar.xz forums-3f19d32f768974454046f744f126515fb3747b99.zip | |
[ticket/15883] Review changes
PHPBB3-15883
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index f541025bf2..7b1dc706db 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -302,7 +302,7 @@ class acp_groups { // Find which users don't exist $actual_name_ary = $name_ary; - $actual_user_id_ary = false; + $actual_user_id_ary = []; user_get_id_name($actual_user_id_ary, $actual_name_ary, false, true); $display_message = $language->lang('GROUP_USERS_INVALID', implode($language->lang('COMMA_SEPARATOR'), array_udiff($name_ary, $actual_name_ary, 'strcasecmp'))); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index e998ffdab9..2be9d089a5 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -27,6 +27,7 @@ if (!defined('IN_PHPBB')) * @param array &$username_ary The usernames to check or empty if user ids used * @param mixed $user_type Array of user types to check, false if not restricting by user type * @param bool $update_references If false, the supplied array is unset and appears unchanged from where it was called +* @return null */ function user_get_id_name(&$user_id_ary, &$username_ary, $user_type = false, $update_references = false) { diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index d0ac598920..4673912aed 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -1068,7 +1068,7 @@ class ucp_groups { // Find which users don't exist $actual_name_ary = $name_ary; - $actual_user_id_ary = false; + $actual_user_id_ary = []; user_get_id_name($actual_user_id_ary, $actual_name_ary, false, true); $display_message = $language->lang('GROUP_USERS_INVALID', implode($language->lang('COMMA_SEPARATOR'), array_udiff($name_ary, $actual_name_ary, 'strcasecmp'))); |