Changeset 1917 in subversion

Timestamp:

Oct 2, 2008 1:26:16 PM (5 years ago)

Author:

alec

Message:

• small improvement in getunread.inc + fix: don't call msglist_select() for getunread and check-recent actions

Location:

trunk/roundcubemail/program

Files:

• js/app.js (modified) (3 diffs)
• steps/mail/getunread.inc (modified) (1 diff)

trunk/roundcubemail/program/js/app.js

@@ -2113 +2113 @@
         if (this.env.signatures[id])
           {
-          newsig = this.env.signatures[id]['text'];
+          newsig = String(this.env.signatures[id]['text']).replace("\n", "\r\n");
           htmlsig = this.env.signatures[id]['is_html'];
           }
@@ -3829 +3829 @@
       case 'list':
         if (this.task == 'mail') {
-          if (this.message_list)
+          if (this.message_list && request_obj.__action == 'list')
             this.msglist_select(this.message_list);
           this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
@@ -3836 +3836 @@
         else if (this.task == 'addressbook')
           this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
+
         break;
       }

trunk/roundcubemail/program/steps/mail/getunread.inc

@@ -24 +24 @@
 if (!empty($a_folders))
 {
+  $inbox = ($IMAP->get_mailbox_name() == 'INBOX');
   foreach ($a_folders as $mbox_row)
-    $OUTPUT->command('set_unread_count', $mbox_row, $IMAP->messagecount($mbox_row, 'UNSEEN'), ($IMAP->get_mailbox_name() == 'INBOX' && $mbox_row == 'INBOX'));
+    $OUTPUT->command('set_unread_count', $mbox_row, $IMAP->messagecount($mbox_row, 'UNSEEN'), $inbox && $mbox_row == 'INBOX');
 }