aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_viewmessage.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2009-07-13 19:20:17 +0000
committerJoas Schilling <nickvergessen@gmx.de>2009-07-13 19:20:17 +0000
commitecfe24528c46b264baa164ba5811fcc5cfab231e (patch)
tree2da60faffcdcf77cb681dc246a65014da2903f96 /phpBB/includes/ucp/ucp_pm_viewmessage.php
parent86096d012940358e0f4bdcf8d78d06018b99a713 (diff)
downloadforums-ecfe24528c46b264baa164ba5811fcc5cfab231e.tar
forums-ecfe24528c46b264baa164ba5811fcc5cfab231e.tar.gz
forums-ecfe24528c46b264baa164ba5811fcc5cfab231e.tar.bz2
forums-ecfe24528c46b264baa164ba5811fcc5cfab231e.tar.xz
forums-ecfe24528c46b264baa164ba5811fcc5cfab231e.zip
Fix bug #47265 - Smilies and images not viewed in topic-print view
Fix - Force full date for PMs print-view Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9753 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index 185a7f523c..82aa5afd8f 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -29,6 +29,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
$msg_id = (int) $msg_id;
$folder_id = (int) $folder_id;
$author_id = (int) $message_row['author_id'];
+ $view = request_var('view', '');
// Not able to view message, it was deleted by the sender
if ($message_row['pm_deleted'])
@@ -192,7 +193,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'EDIT_IMG' => $user->img('icon_post_edit', $user->lang['POST_EDIT_PM']),
'MINI_POST_IMG' => $user->img('icon_post_target', $user->lang['PM']),
- 'SENT_DATE' => $user->format_date($message_row['message_time']),
+ 'SENT_DATE' => ($view == 'print') ? $user->format_date($message_row['message_time'], false, true) : $user->format_date($message_row['message_time']),
'SUBJECT' => $message_row['message_subject'],
'MESSAGE' => $message,
'SIGNATURE' => ($message_row['enable_sig']) ? $signature : '',