aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCrizzo <mail@crizzo.de>2014-03-15 15:37:55 +0100
committerCrizzo <mail@crizzo.de>2014-03-28 19:12:32 +0100
commit9d568986ade8ae24bad3c57475b9420d743ecbb6 (patch)
tree2762fc9756c538589bc966e60dd3fe0aca0d3203
parent0d4968f7356cc177a4a0921eef2853c343798110 (diff)
downloadforums-9d568986ade8ae24bad3c57475b9420d743ecbb6.tar
forums-9d568986ade8ae24bad3c57475b9420d743ecbb6.tar.gz
forums-9d568986ade8ae24bad3c57475b9420d743ecbb6.tar.bz2
forums-9d568986ade8ae24bad3c57475b9420d743ecbb6.tar.xz
forums-9d568986ade8ae24bad3c57475b9420d743ecbb6.zip
[ticket/9758] Error because of missing functions_display.php fixed
PHPBB3-9758
-rw-r--r--phpBB/includes/mcp/mcp_warn.php5
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php5
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php
index 418bab4533..0b6a49d9c7 100644
--- a/phpBB/includes/mcp/mcp_warn.php
+++ b/phpBB/includes/mcp/mcp_warn.php
@@ -293,9 +293,10 @@ 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.' . $phpEx);
+ 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);
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 715d99f168..80974e752e 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -266,6 +266,11 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
}
}
+ if (!function_exists('phpbb_gen_download_links'))
+ {
+ include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
+ }
+
// Display not already displayed Attachments for this post, we already parsed them. ;)
if (isset($attachments) && sizeof($attachments))
{