Bug 1116959 - Removing search terms blanks out results list in AB, contacts sidebar search. r=mkmelin, a=Paenglab

mail/components/addrbook/content/abCommon.js

@@ -661,6 +661,10 @@ function getSearchTokens(aSearchString)
  */
 function generateQueryURI(aModelQuery, aSearchWords)
 {
+  // If there are no search tokens, we simply return an empty string.
+  if (!aSearchWords || aSearchWords.length == 0)
+    return "";
+
   let queryURI = "";
   aSearchWords.forEach(searchWord =>
     queryURI += aModelQuery.replace(/@V/g, encodeABTermValue(searchWord)));

mailnews/addrbook/src/nsAbAutoCompleteSearch.js

@@ -494,6 +494,10 @@ function getSearchTokens(aSearchString)
  */
 function generateQueryURI(aModelQuery, aSearchWords)
 {
+  // If there are no search tokens, we simply return an empty string.
+  if (!aSearchWords || aSearchWords.length == 0)
+    return "";
+
   let queryURI = "";
   aSearchWords.forEach(searchWord =>
     queryURI += aModelQuery.replace(/@V/g, encodeABTermValue(searchWord)));