aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_viewfolder.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-04-17 13:15:44 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-04-17 13:15:44 +0000
commit7d28ad910673b7132f4b087e5b520ab999c7e3c0 (patch)
treec1022b323950c9d8b5fed10a48cceaa9822bbab9 /phpBB/includes/ucp/ucp_pm_viewfolder.php
parent60422b7b78c6c468c9f0553ebf49e16562c3f772 (diff)
downloadforums-7d28ad910673b7132f4b087e5b520ab999c7e3c0.tar
forums-7d28ad910673b7132f4b087e5b520ab999c7e3c0.tar.gz
forums-7d28ad910673b7132f4b087e5b520ab999c7e3c0.tar.bz2
forums-7d28ad910673b7132f4b087e5b520ab999c7e3c0.tar.xz
forums-7d28ad910673b7132f4b087e5b520ab999c7e3c0.zip
fix for #r9451
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9454 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewfolder.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewfolder.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php
index 2dcf3f8193..cb96b77754 100644
--- a/phpBB/includes/ucp/ucp_pm_viewfolder.php
+++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php
@@ -328,7 +328,8 @@ function view_folder($id, $mode, $folder_id, $folder)
$data[] = array(
'subject' => censor_text($row['message_subject']),
'sender' => $row['username'],
- 'date' => $user->format_date($row['message_time'], (PHP_VERSION >= 5) ? 'c' : "Y-m-d\TH:i:sO", true), // ISO 8601 date
+ // ISO 8601 date. For PHP4 we are able to hardcode the timezone because $user->format_date() does not set it.
+ 'date' => $user->format_date($row['message_time'], (PHP_VERSION >= 5) ? 'c' : "Y-m-d\TH:i:s+00:00", true),
'to' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? $address[$message_id] : '',
'message' => $message_row['message_text']
);