makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop

Browse source 
* github-dhruv/ticket/10797:
  [ticket/10797] language key rank moved to common
  [ticket/10797] user rank is displayed in mcp_warn.php
This commit is contained in:
Nils Adermann 2012-04-20 01:08:21 +02:00
commit 6ae68a3eb5
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/mcp/mcp_warn.php
View file

@ -307,7 +307,7 @@ class mcp_warn
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); 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']); $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( $template->assign_vars(array(
@ -412,7 +412,7 @@ class mcp_warn
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); 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']); $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 // OK, they didn't submit a warning so lets build the page for them to do so

1
phpBB/language/en/common.php
View file

@ -492,6 +492,7 @@ $lang = array_merge($lang, array(
'PRIVATE_MESSAGING' => 'Private messaging', 'PRIVATE_MESSAGING' => 'Private messaging',
'PROFILE' => 'User Control Panel', 'PROFILE' => 'User Control Panel',
'RANK' => 'Rank',
'READING_FORUM' => 'Viewing topics in %s', 'READING_FORUM' => 'Viewing topics in %s',
'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement', 'READING_GLOBAL_ANNOUNCE' => 'Reading global announcement',
'READING_LINK' => 'Following forum link %s', 'READING_LINK' => 'Following forum link %s',

1
phpBB/language/en/memberlist.php
View file

@ -111,7 +111,6 @@ $lang = array_merge($lang, array(
'POST_IP' => 'Posted from IP/domain', 'POST_IP' => 'Posted from IP/domain',
'RANK' => 'Rank',
'REAL_NAME' => 'Recipient name', 'REAL_NAME' => 'Recipient name',
'RECIPIENT' => 'Recipient', 'RECIPIENT' => 'Recipient',
'REMOVE_FOE' => 'Remove foe', 'REMOVE_FOE' => 'Remove foe',