From 51ab4281b2c074e4f8ee8fcd6fe14cfb9d888a26 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 14 Dec 2009 18:01:19 -0700 Subject: [PATCH] Remove unused data elements --- imp/js/DimpBase.js | 3 +-- imp/lib/Views/ShowMessage.php | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/imp/js/DimpBase.js b/imp/js/DimpBase.js index 96676c799..d4a5e0094 100644 --- a/imp/js/DimpBase.js +++ b/imp/js/DimpBase.js @@ -1144,8 +1144,7 @@ var DimpBase = { tmp.invoke('update', r.subject === null ? '[' + DIMP.text.badsubject + ']' : r.subject); // Add date - $('msgHeadersColl').select('.date').invoke('update', r.minidate); - $('msgHeaderDate').select('.date').invoke('update', r.localdate); + [ $('msgHeadersColl').select('.date'), $('msgHeaderDate').select('.date') ].flatten().invoke('update', r.localdate); // Add from/to/cc headers [ 'from', 'to', 'cc' ].each(function(a) { diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php index 9c93fbcc6..5c0d01a6b 100644 --- a/imp/lib/Views/ShowMessage.php +++ b/imp/lib/Views/ShowMessage.php @@ -76,8 +76,7 @@ class IMP_Views_ShowMessage * 'uid' - The IMAP UID * * FOR PREVIEW MODE: - * 'fulldate' - The fully formatted date - * 'minidate' - A miniature date + * 'localdate' - The date formatted to the user's timezone * * FOR NON-PREVIEW MODE: * 'bcc' - The Bcc addresses @@ -207,11 +206,11 @@ class IMP_Views_ShowMessage if ($preview) { /* Get minidate. */ $imp_mailbox_ui = new IMP_Ui_Mailbox(); - $minidate = $imp_mailbox_ui->getDate($envelope['date']); - if (empty($minidate)) { - $minidate = _("Unknown Date"); + $localdate = $imp_mailbox_ui->getDate($envelope['date']); + if (empty($localdate)) { + $localdate = _("Unknown Date"); } - $result['localdate'] = $result['minidate'] = htmlspecialchars($minidate); + $result['localdate'] = htmlspecialchars($localdate); } else { /* Display the user-specified headers for the current identity. */ $user_hdrs = $imp_ui->getUserHeaders(); -- 2.11.0