[mms] Fix scrolling through large search mailboxes in dynamic view (B…

…ug #13138). Conflicts: imp/docs/CHANGES imp/package.xml
horde · Apr 22, 2014 · 1fcfc5e · 1fcfc5e
1 parent 405e1c2
commit 1fcfc5e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -78,6 +78,8 @@ v6.1.8
       view (João Machado <geral@jpaulo.eu>).
 [mms] SECURITY: Fix XSS in displaying mailbox name in dynamic mailbox view
       (João Machado <geral@jpaulo.eu>).
+[mms] Fix scrolling through large search mailboxes in dynamic view (Bug
+      #13138).
 [mms] Better handling of malformed message dates in mailbox listing (Bug
       #13114).
 [jan] Update Korean translation (Deokgon Kim <dgkim@dgkim.net>).

diff --git a/imp/lib/Ajax/Application/ListMessages.php b/imp/lib/Ajax/Application/ListMessages.php
@@ -131,10 +131,13 @@ public function listMessages($args)
 
         if ($is_search) {
             /* For search mailboxes, we need to invalidate all browser data
-             * and repopulate, since BUIDs may have changed. */
-             $args['cache'] = array();
-             $args['change'] = true;
-             $result->data_reset = $result->rowlist_reset = true;
+             * and repopulate on force update, since BUIDs may have
+             * changed (TODO: only do this if search mailbox has changed?). */
+            if (!empty($args['change'])) {
+                 $args['cache'] = array();
+                 $args['change'] = true;
+                 $result->data_reset = $result->rowlist_reset = true;
+            }
         } elseif (!$args['initial'] && $args['cacheid'] && $args['cache']) {
             /* Check for UIDVALIDITY expiration. If it has changed, we need to
              * purge the cached items on the browser. */

diff --git a/imp/package.xml b/imp/package.xml
@@ -3566,6 +3566,7 @@
 * [mms] SECURITY: Fix XSS in displaying user-defined flags in basic mailbox and message view.
 * [mms] SECURITY: Fix XSS in displaying user-defined flags in dynamic mailbox view (João Machado &lt;geral@jpaulo.eu&gt;).
 * [mms] SECURITY: Fix XSS in displaying mailbox name in dynamic mailbox view (João Machado &lt;geral@jpaulo.eu&gt;).
+* [mms] Fix scrolling through large search mailboxes in dynamic view (Bug #13138).
 * [mms] Better handling of malformed message dates in mailbox listing (Bug #13114).
 * [jan] Update Korean translation (Deokgon Kim &lt;dgkim@dgkim.net&gt;).
    </notes>