diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-08-18 18:44:23 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-08-19 13:51:21 +0200 |
| commit | 5e7d9d2fcf5a78ef97287c635310c6ea28572464 (patch) | |
| tree | b5f2f2c5e2c9edee0a0be470431de96d263393a8 | |
| parent | 496cc64bc63befc2bb6f250e1712cd5a00986aef (diff) | |
| download | forums-5e7d9d2fcf5a78ef97287c635310c6ea28572464.tar forums-5e7d9d2fcf5a78ef97287c635310c6ea28572464.tar.gz forums-5e7d9d2fcf5a78ef97287c635310c6ea28572464.tar.bz2 forums-5e7d9d2fcf5a78ef97287c635310c6ea28572464.tar.xz forums-5e7d9d2fcf5a78ef97287c635310c6ea28572464.zip | |
[ticket/12993] Fix includes of functions_display
PHPBB3-12993
| -rw-r--r-- | phpBB/includes/functions_compatibility.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_warn.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/user_loader.php | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index b371978ee5..efd586c234 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -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) { + 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); } diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index 356988d2e8..b4b6656499 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -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); // 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); } @@ -486,7 +486,7 @@ class mcp_warn } // 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); } diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index c98aa39b5b..a36ee398f4 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -403,7 +403,7 @@ 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')) + if (!function_exists('phpbb_get_user_rank')) { include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 35199d8864..4da2b383c6 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -212,7 +212,7 @@ class user_loader 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); } |