From 623aced10ebe9036a1b9ec2c491884a302a9d67e Mon Sep 17 00:00:00 2001
From: "sspitzer@mozilla.org" <none@none>
Date: Fri, 15 Jun 2007 22:03:40 -0700
Subject: [PATCH] fix for bug #384670:  current collection searches in bookmark
 organizer window search all of bookmarks

r=dietrich
---
 browser/components/places/content/history-panel.js | 2 +-
 browser/components/places/content/places.js        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/components/places/content/history-panel.js b/browser/components/places/content/history-panel.js
index ac6b16528fd..74d7ab15bef 100644
--- a/browser/components/places/content/history-panel.js
+++ b/browser/components/places/content/history-panel.js
@@ -166,6 +166,6 @@ function searchHistory(aInput)
   }
 
   gHistoryTree.applyFilter(aInput, false /* onlyBookmarks */, 
-                           0 /* folderRestrict */, null); 
+                           null /* folderRestrict */, null); 
 }
 
diff --git a/browser/components/places/content/places.js b/browser/components/places/content/places.js
index e6912484c82..cb03de692aa 100755
--- a/browser/components/places/content/places.js
+++ b/browser/components/places/content/places.js
@@ -364,7 +364,7 @@ var PlacesSearchBox = {
     switch (PlacesSearchBox.filterCollection) {
     case "collection":
       var folderId = content.getResult().root.itemId;
-      content.applyFilter(filterString, true, folderId, OptionsFilter);
+      content.applyFilter(filterString, true, [folderId], OptionsFilter);
       PO.setHeaderText(PO.HEADER_TYPE_SEARCH, filterString);
       break;
     case "bookmarks":
@@ -374,7 +374,7 @@ var PlacesSearchBox = {
         PlacesOrganizer.onPlaceSelected();
       break;
     case "all":
-      content.applyFilter(filterString, false, 0, OptionsFilter);
+      content.applyFilter(filterString, false, null, OptionsFilter);
       PO.setHeaderText(PO.HEADER_TYPE_SEARCH, filterString);
       break;
     }