Changeset bdb13a5 in github

Timestamp:

Jun 28, 2010 1:36:26 PM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

02cc63c

Parents:

6052766

Message:

• Fix RC forgets search results (#1483883)

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (2 diffs)
• program/steps/addressbook/search.inc (modified) (1 diff)
• program/steps/mail/search.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix RC forgets search results (#1483883)
+- TinyMCE 3.3.7
 - Improve parsing of styled empty tags in HTML messages (#1486812)
 - Add %dc variable support in base_dn/bind_dn config (#1486779)

program/js/app.js

@@ -488 +488 @@
       case 'list':
         if (this.task=='mail') {
-          if (this.env.search_request<0 || (props != '' && (this.env.search_request && props != this.env.mailbox)))
+          if (!this.env.search_request || (props && props != this.env.mailbox))
             this.reset_qsearch();
 
@@ -497 +497 @@
         }
         else if (this.task=='addressbook') {
-          if (this.env.search_request<0 || (this.env.search_request && props != this.env.source))
+          if (!this.env.search_request || (props != this.env.source))
             this.reset_qsearch();
 

program/steps/addressbook/search.inc

@@ -40 +40 @@
 {
   $OUTPUT->show_message('nocontactsfound', 'warning');
-  $search_request = -1;
+  $search_request = null;
 }
 

program/steps/mail/search.inc

@@ -129 +129 @@
 
 // update message count display
-$OUTPUT->set_env('search_request', $search_str ? $search_request : -1);
+$OUTPUT->set_env('search_request', $search_str ? $search_request : '');
 $OUTPUT->set_env('messagecount', $count);
 $OUTPUT->set_env('pagecount', ceil($count/$IMAP->page_size));