aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/widgets.php2
-rw-r--r--mod/mail.php2
-rw-r--r--view/js/main.js1
-rw-r--r--view/js/mod_mail.js1
-rwxr-xr-xview/tpl/prv_message.tpl2
5 files changed, 4 insertions, 4 deletions
diff --git a/include/widgets.php b/include/widgets.php
index 3e6fdb04c..0f61a04a0 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -642,7 +642,7 @@ function widget_conversations($arr) {
'subject' => (($rr['seen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'),
'delete' => t('Delete conversation'),
'body' => $rr['body'],
- 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], t('D, d M Y - g:i A')),
+ 'date' => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
'seen' => $rr['seen'],
'selected' => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id']))
);
diff --git a/mod/mail.php b/mod/mail.php
index 884c41565..536149a28 100644
--- 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'];
diff --git a/view/js/main.js b/view/js/main.js
index acdc2e5f5..fd03802c5 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1156,7 +1156,6 @@ $(document).ready(function() {
numbers : aStr['t17'],
};
- $(".autotime").timeago();
$("#toc").toc();
});
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
index 36b22138f..561df7229 100644
--- a/view/js/mod_mail.js
+++ b/view/js/mod_mail.js
@@ -2,4 +2,5 @@ $(document).ready(function() {
$("#recip").name_autocomplete(baseurl + '/acl', '', false, function(data) {
$("#recip-complete").val(data.xid);
});
+ $(".autotime").timeago()
});
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index b0ea8b753..20f5df39a 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -31,7 +31,7 @@
<div class="form-group">
<label for="prvmail-text">{{$yourmessage}}</label>
- <textarea class="form-control" id="prvmail-text" name="body"">{{$text}}</textarea>
+ <textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea>
</div>
<div id="prvmail-submit-wrapper" class="form-group">