diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-19 22:25:01 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-08-19 22:25:01 +0200 |
| commit | fe1ab6d2efe7389ab5deb6cab0d721a1fa80c503 (patch) | |
| tree | 849b434027921b495c54f4504f155f662f52f9c0 /phpBB/includes/mcp/mcp_warn.php | |
| parent | 5e7d9d2fcf5a78ef97287c635310c6ea28572464 (diff) | |
| download | forums-fe1ab6d2efe7389ab5deb6cab0d721a1fa80c503.tar forums-fe1ab6d2efe7389ab5deb6cab0d721a1fa80c503.tar.gz forums-fe1ab6d2efe7389ab5deb6cab0d721a1fa80c503.tar.bz2 forums-fe1ab6d2efe7389ab5deb6cab0d721a1fa80c503.tar.xz forums-fe1ab6d2efe7389ab5deb6cab0d721a1fa80c503.zip | |
[ticket/12993] Return an array instead of reference passing
PHPBB3-12993
Diffstat (limited to 'phpBB/includes/mcp/mcp_warn.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index b4b6656499..37e4d62fb7 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -341,7 +341,7 @@ class mcp_warn include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } - phpbb_get_user_rank($user_row, $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src); + $user_rank_data = phpbb_get_user_rank($user_row, $user_row['user_posts']); $avatar_img = phpbb_get_user_avatar($user_row); $template->assign_vars(array( @@ -350,13 +350,13 @@ class mcp_warn 'POST' => $message, 'USERNAME' => $user_row['username'], 'USER_COLOR' => (!empty($user_row['user_colour'])) ? $user_row['user_colour'] : '', - 'RANK_TITLE' => $rank_title, + 'RANK_TITLE' => $user_rank_data['title'], 'JOINED' => $user->format_date($user_row['user_regdate']), 'POSTS' => ($user_row['user_posts']) ? $user_row['user_posts'] : 0, 'WARNINGS' => ($user_row['user_warnings']) ? $user_row['user_warnings'] : 0, 'AVATAR_IMG' => $avatar_img, - 'RANK_IMG' => $rank_img, + 'RANK_IMG' => $user_rank_data['img'], 'L_WARNING_POST_DEFAULT' => sprintf($user->lang['WARNING_POST_DEFAULT'], generate_board_url() . "/viewtopic.$phpEx?f=$forum_id&p=$post_id#p$post_id"), @@ -490,14 +490,14 @@ class mcp_warn { include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } - phpbb_get_user_rank($user_row, $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src); + $user_rank_data = phpbb_get_user_rank($user_row, $user_row['user_posts']); $avatar_img = phpbb_get_user_avatar($user_row); // OK, they didn't submit a warning so lets build the page for them to do so $template->assign_vars(array( 'U_POST_ACTION' => $this->u_action, - 'RANK_TITLE' => $rank_title, + 'RANK_TITLE' => $user_rank_data['title'], 'JOINED' => $user->format_date($user_row['user_regdate']), 'POSTS' => ($user_row['user_posts']) ? $user_row['user_posts'] : 0, 'WARNINGS' => ($user_row['user_warnings']) ? $user_row['user_warnings'] : 0, @@ -508,7 +508,7 @@ class mcp_warn 'U_PROFILE' => get_username_string('profile', $user_row['user_id'], $user_row['username'], $user_row['user_colour']), 'AVATAR_IMG' => $avatar_img, - 'RANK_IMG' => $rank_img, + 'RANK_IMG' => $user_rank_data['img'], 'S_CAN_NOTIFY' => $s_can_notify, )); |