mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity

[ticket/12993] Fix includes of functions_display

Browse Source 
PHPBB3-12993
This commit is contained in:
Tristan Darricau 2014-08-18 18:44:23 +02:00
parent 496cc64bc6
commit 5e7d9d2fcf
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/functions_compatibility.php
View File

@ -182,5 +182,11 @@ function update_foes($group_id = false, $user_id = false)
*/ */
function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src) function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src)
{ {
global $phpbb_root_path, $phpEx;
if (!function_exists('phpbb_get_user_rank'))
{
include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
}
phpbb_get_user_rank(array('user_rank' => $user_rank), $user_posts, $rank_title, $rank_img, $rank_img_src); phpbb_get_user_rank(array('user_rank' => $user_rank), $user_posts, $rank_title, $rank_img, $rank_img_src);
} }

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

@ -336,7 +336,7 @@ class mcp_warn
$message = generate_text_for_display($user_row['post_text'], $user_row['bbcode_uid'], $user_row['bbcode_bitfield'], $parse_flags, true); $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 // Generate the appropriate user information for the user we are looking at
if (!function_exists('get_user_rank')) if (!function_exists('phpbb_get_user_rank'))
{ {
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
} }
@ -486,7 +486,7 @@ class mcp_warn
} }
// Generate the appropriate user information for the user we are looking at // Generate the appropriate user information for the user we are looking at
if (!function_exists('get_user_rank')) if (!function_exists('phpbb_get_user_rank'))
{ {
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
} }

2
phpBB/includes/ucp/ucp_pm_viewmessage.php
View File

@ -403,7 +403,7 @@ function get_user_information($user_id, $user_row)
$user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : ''; $user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
if (!function_exists('get_user_rank')) if (!function_exists('phpbb_get_user_rank'))
{ {
include($phpbb_root_path . 'includes/functions_display.' . $phpEx); include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
} }

2
phpBB/phpbb/user_loader.php
View File

@ -212,7 +212,7 @@ class user_loader
return ''; return '';
} }
if (!function_exists('get_user_rank')) if (!function_exists('phpbb_get_user_rank'))
{ {
include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
} }