diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-31 20:29:45 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-31 20:29:45 +0200 |
| commit | ba84268d4ed2d6498f87b5a466f2bd6465e48f42 (patch) | |
| tree | 2f55bd871af3f7f447fe321912b0a631b2c719ad /phpBB/includes/mcp/mcp_warn.php | |
| parent | a618710a69cf797d2b64a3567b2d2da327cddc25 (diff) | |
| parent | fa6c1044b8b11baf1d100f695e8b17457d26fd4a (diff) | |
| download | forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.tar forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.tar.gz forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.tar.bz2 forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.tar.xz forums-ba84268d4ed2d6498f87b5a466f2bd6465e48f42.zip | |
Merge remote-tracking branch 'crizz0/ticket/9758' into develop-ascraeus
* crizz0/ticket/9758:
[ticket/9758] Clickable avatar in header and renamed class for avatar-img
[ticket/9758] Remove unnessary if-question for include functions_display
[ticket/9758] Slims the line 4775 in includes/functions.php
[ticket/9758] Adds id and changes filter to fix travis CI test
[ticket/9758] Removed the needless space after first ENDIF
[ticket/9758] Adding impr. for overall_header display of avatar and username
[ticket/9758] Fixed bug in mcp_warn.php
[ticket/9758] Optimises the html code of avatar image in header
[ticket/9758] Error because of missing functions_display.php fixed
[ticket/9758] Removed useless if-conditions to include functions.php
[ticket/9758] Changes class name of new "span" in overall_header.html
[ticket/9758] Adds global template variable CURRENT_USER_AVATAR
Diffstat (limited to 'phpBB/includes/mcp/mcp_warn.php')
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index d396d004dc..768b7c991d 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -293,7 +293,7 @@ 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('phpbb_get_user_avatar')) + if (!function_exists('get_user_rank')) { include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } @@ -398,11 +398,10 @@ class mcp_warn } // Generate the appropriate user information for the user we are looking at - if (!function_exists('phpbb_get_user_avatar')) + 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); |