diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-04-20 01:11:00 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-04-20 01:11:00 +0200 |
| commit | 57547c7e20fd2133df71e842642ff23cd8b98523 (patch) | |
| tree | f45baa923974829212fbfad2c25ceb96f9aa6ab5 /phpBB | |
| parent | f1f2ab92b15e57c182dadfd9f3cd606cff13946c (diff) | |
| parent | 90fc8fe59f5f6e53071a8ccb85d085d62491c466 (diff) | |
| download | forums-57547c7e20fd2133df71e842642ff23cd8b98523.tar forums-57547c7e20fd2133df71e842642ff23cd8b98523.tar.gz forums-57547c7e20fd2133df71e842642ff23cd8b98523.tar.bz2 forums-57547c7e20fd2133df71e842642ff23cd8b98523.tar.xz forums-57547c7e20fd2133df71e842642ff23cd8b98523.zip | |
Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympus
* 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')
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/memberlist.php | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 63e5b19155..1016204ff8 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -308,7 +308,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( @@ -413,7 +413,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 diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 0c387d0f36..0184dd083b 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -460,6 +460,7 @@ $lang = array_merge($lang, array( 'PRIVATE_MESSAGING' => 'Private messaging', 'PROFILE' => 'User Control Panel', + 'RANK' => 'Rank', 'READING_FORUM' => 'Viewing topics in %s', 'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement', 'READING_LINK' => 'Following forum link %s', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index e71f9d6565..7dc5e6b74a 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -110,7 +110,6 @@ $lang = array_merge($lang, array( 'POST_IP' => 'Posted from IP/domain', - 'RANK' => 'Rank', 'REAL_NAME' => 'Recipient name', 'RECIPIENT' => 'Recipient', 'REMOVE_FOE' => 'Remove foe', |