Merge https://github.com/redmatrix/hubzilla into pending_merge

2015-11-03 14:59:43 -08:00
parent 2c299a9f37 9fa771f9fe
commit c1cfcc78fe
9 changed files with 38 additions and 26 deletions
--- a/mod/mail.php
+++ b/mod/mail.php
@@ -335,7 +335,7 @@ function mail_content(&$a) {
 			'recall' => t('Recall message'),
 			'can_recall' => (($channel['channel_hash'] == $message['from_xchan']) ? true : false),
 			'is_recalled' => (intval($message['mail_recalled']) ? t('Message has been recalled.') : ''),
-			'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
+			'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'], 'c'),
 		);
 				
 		$seen = $message['seen'];