From 672621e389fb35f563e0df02d009484cfd9bea9f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 09 May 2014 04:19:42 -0400
Subject: [PATCH] Fix searching in addressbook broken with multi-folder search implementation (#1489869)

---
 program/js/app.js |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index f6acdf8..042ebb7 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4244,10 +4244,10 @@
       url._q = search;
 
       if (!smods && mods && this.message_list)
-        smods = mods[mbox] || mods['*'];
+        mods = mods[mbox] || mods['*'];
 
-      if (smods) {
-        for (n in smods)
+      if (mods) {
+        for (n in mods)
           mods_arr.push(n);
         url._headers = mods_arr.join(',');
       }
@@ -4302,7 +4302,8 @@
     if (!this.env.search_mods)
       this.env.search_mods = {};
 
-    this.env.search_mods[mbox] = mods;
+    if (mbox)
+      this.env.search_mods[mbox] = mods;
   };
 
   this.is_multifolder_listing = function()

--
Gitblit v1.9.1