From 172e3346cac526a9bd567328b222549b76b9e3db Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 9 Jun 2010 13:39:48 +0000
Subject: - Added mailboxlist options menu in message page

---
 program/js/app.js           | 3 ++-
 program/steps/mail/show.inc | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'program')

diff --git a/program/js/app.js b/program/js/app.js
index df512d06d..3067794e8 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -5022,7 +5022,8 @@ function rcube_webmail()
             this.enable_command(this.env.message_commands, 'purge', 'expunge',
               'select-all', 'select-none', 'sort', 'expand-all', 'expand-unread', 'collapse-all', false);
           }
-          this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
+          if (this.message_list)
+            this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
         }
         break;
 
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index e130ecb76..71cbf7086 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -64,7 +64,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
 
   if (!$OUTPUT->ajax_call)
     $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
-        
+
   // check for unset disposition notification
   if ($MESSAGE->headers->mdn_to &&
       !$MESSAGE->headers->mdn_sent && !$MESSAGE->headers->seen &&
@@ -128,6 +128,9 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
       $OUTPUT->set_env('next_uid', $next);
     if ($last > 0)
       $OUTPUT->set_env('last_uid', $last);
+
+    // Don't need a real messages count value
+    $OUTPUT->set_env('messagecount', 1);
     }
 
   if (!$MESSAGE->headers->seen && ($RCMAIL->action == 'show' || ($RCMAIL->action == 'preview' && intval($CONFIG['preview_pane_mark_read']) == 0)))
-- 
cgit v1.2.3