diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-20 01:08:21 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-20 01:08:21 +0200 |
| commit | 6ae68a3eb562da08881ab5dfc22e21a03a25fb98 (patch) | |
| tree | 7cc3d346ef839eeee9dd36b81d7647e840b08abb /phpBB/includes | |
| parent | 41b23542d3d70694e9c75b4904e0ee22c771ac06 (diff) | |
| parent | 90fc8fe59f5f6e53071a8ccb85d085d62491c466 (diff) | |
| download | forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.tar forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.tar.gz forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.tar.bz2 forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.tar.xz forums-6ae68a3eb562da08881ab5dfc22e21a03a25fb98.zip | |
Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop
* github-dhruv/ticket/10797:
[ticket/10797] language key rank moved to common
[ticket/10797] user rank is displayed in mcp_warn.php
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 9d838790a0..c614beea3b 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -307,7 +307,7 @@ class mcp_warn include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } - $rank_title = $rank_img = ''; + get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src); $avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']); $template->assign_vars(array( @@ -412,7 +412,7 @@ class mcp_warn include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } - $rank_title = $rank_img = ''; + get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src); $avatar_img = get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']); // OK, they didn't submit a warning so lets build the page for them to do so |