From ddbdde53abfb01d3dee3ff2256610fcdac12ce3e Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sat, 15 Mar 2014 14:57:12 +0100 Subject: [ticket/9758] Adds global template variable CURRENT_USER_AVATAR PHPBB3-9758 --- phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php') diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index b68389cba7..0249eee6af 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -340,7 +340,7 @@ function get_user_information($user_id, $user_row) if (!function_exists('phpbb_get_user_avatar')) { - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + include($phpbb_root_path . 'includes/functions.' . $phpEx); } $user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : ''; -- cgit v1.2.1 From 0d4968f7356cc177a4a0921eef2853c343798110 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sat, 15 Mar 2014 15:18:04 +0100 Subject: [ticket/9758] Removed useless if-conditions to include functions.php PHPBB3-9758 --- phpBB/includes/ucp/ucp_pm_viewmessage.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php') diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 0249eee6af..715d99f168 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -338,11 +338,6 @@ function get_user_information($user_id, $user_row) } } - if (!function_exists('phpbb_get_user_avatar')) - { - include($phpbb_root_path . 'includes/functions.' . $phpEx); - } - $user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : ''; get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']); -- cgit v1.2.1 From 9d568986ade8ae24bad3c57475b9420d743ecbb6 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sat, 15 Mar 2014 15:37:55 +0100 Subject: [ticket/9758] Error because of missing functions_display.php fixed PHPBB3-9758 --- phpBB/includes/ucp/ucp_pm_viewmessage.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php') 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)) { -- cgit v1.2.1 From aa6077c1508553c2ba14a4f220215984ede63ae1 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Sat, 15 Mar 2014 16:01:40 +0100 Subject: [ticket/9758] Fixed bug in mcp_warn.php PHPBB3-9758 --- phpBB/includes/ucp/ucp_pm_viewmessage.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php') 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')) -- cgit v1.2.1 From cde4070b193cd8cce0d9fb3ffb7de8f3e3f5a08e Mon Sep 17 00:00:00 2001 From: Crizzo Date: Fri, 28 Mar 2014 14:19:05 +0100 Subject: [ticket/9758] Remove unnessary if-question for include functions_display PHPBB3-9758 --- phpBB/includes/ucp/ucp_pm_viewmessage.php | 5 ----- 1 file changed, 5 deletions(-) (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php') diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 548aa2af3a..03064a31d3 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -266,11 +266,6 @@ 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)) { -- cgit v1.2.1