diff options
| author | Crizzo <mail@crizzo.de> | 2014-03-15 16:01:40 +0100 |
|---|---|---|
| committer | Crizzo <mail@crizzo.de> | 2014-03-28 19:12:35 +0100 |
| commit | aa6077c1508553c2ba14a4f220215984ede63ae1 (patch) | |
| tree | de3a3b8050a1427ded506b698668b5a8bb5ed3ad /phpBB | |
| parent | ce1b4da59ec3e1c562ad50dac33c167068ac2093 (diff) | |
| download | forums-aa6077c1508553c2ba14a4f220215984ede63ae1.tar forums-aa6077c1508553c2ba14a4f220215984ede63ae1.tar.gz forums-aa6077c1508553c2ba14a4f220215984ede63ae1.tar.bz2 forums-aa6077c1508553c2ba14a4f220215984ede63ae1.tar.xz forums-aa6077c1508553c2ba14a4f220215984ede63ae1.zip | |
[ticket/9758] Fixed bug in mcp_warn.php
PHPBB3-9758
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 0b6a49d9c7..768b7c991d 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -293,7 +293,6 @@ class mcp_warn $message = generate_text_for_display($user_row['post_text'], $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], $parse_flags, true); // Generate the appropriate user information for the user we are looking at - if (!function_exists('get_user_rank')) { include($phpbb_root_path . 'includes/functions_display.' . $phpEx); @@ -399,7 +398,10 @@ class mcp_warn } // Generate the appropriate user information for the user we are looking at - + if (!function_exists('get_user_rank')) + { + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + } get_user_rank($user_row['user_rank'], $user_row['user_posts'], $rank_title, $rank_img, $rank_img_src); $avatar_img = phpbb_get_user_avatar($user_row); diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 80974e752e..548aa2af3a 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -345,6 +345,11 @@ function get_user_information($user_id, $user_row) $user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : ''; + if (!function_exists('get_user_rank')) + { + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + } + get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']); if ((!empty($user_row['user_allow_viewemail']) && $auth->acl_get('u_sendemail')) || $auth->acl_get('a_email')) |