From 49a634c18da85036a0850c7854545f36b73dc560 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Fri, 15 Jun 2012 17:57:34 +0800
Subject: Better fix instant search crashing when a product is not pre-selected

---
 template/en/default/search/search-instant.html.tmpl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'template/en/default/search')

diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl
index c14b681b1..9803dc9e1 100644
--- a/template/en/default/search/search-instant.html.tmpl
+++ b/template/en/default/search/search-instant.html.tmpl
@@ -15,7 +15,9 @@
   yui = [ 'datatable', 'container' ]
 %]
 
-[% default.product.push('Firefox') UNLESS default.product.size %]
+[% UNLESS default.exists('product') && default.product.size %]
+  [% default.product = [ 'Firefox' ] %]
+[% END %]
 
 <script>
 YAHOO.bugzilla.instantSearch.setLabels( {
@@ -46,7 +48,7 @@ YAHOO.bugzilla.instantSearch.setLabels( {
             [% FOREACH p = user.get_selectable_products(c.id) %]
               [% IF p.components.size %]
                 <option value="[% p.name FILTER html %]"
-                  [% " selected" IF default.product && lsearch(default.product, p.name) != -1 %]>
+                  [% " selected" IF lsearch(default.product, p.name) != -1 %]>
                   [% p.name FILTER html %]
                 </option>
               [% END %]
@@ -56,7 +58,7 @@ YAHOO.bugzilla.instantSearch.setLabels( {
         [% ELSE %]
           [% FOREACH p = product %]
             <option value="[% p.name FILTER html %]"
-              [% " selected" IF default.product && lsearch(default.product, p.name) != -1 %]>
+              [% " selected" IF lsearch(default.product, p.name) != -1 %]>
               [% p.name FILTER html %]
             </option>
           [% END %]
-- 
cgit v1.2.3-24-g4f1b