Index: mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl,v
retrieving revision 1.48
diff -pu -r1.48 mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl
--- mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl
+++ mozilla/webtools/bugzilla/template/en/default/global/header.html.tmpl
@@ -82,7 +82,9 @@
       [% END %]
     [% END %]
 
-    [%+ INCLUDE "global/help-header.html.tmpl" %]
+    [%+ INCLUDE "global/help-header.html.tmpl"
+        help_block => help_block
+     %]
 
     [%# Set up the skin CSS cascade:
       #  1. Standard Bugzilla stylesheet set (persistent)
Index: mozilla/webtools/bugzilla/template/en/default/global/help-header.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/global/help-header.html.tmpl,v
retrieving revision 1.6
diff -pu -r1.6 mozilla/webtools/bugzilla/template/en/default/global/help-header.html.tmpl
--- mozilla/webtools/bugzilla/template/en/default/global/help-header.html.tmpl
+++ mozilla/webtools/bugzilla/template/en/default/global/help-header.html.tmpl
@@ -34,58 +34,62 @@
     }
     </style>
 
+    [% IF help_block.defined && help_block.contains("initHelp") %]
+      <script type="text/javascript">
+      var currentHelp;
+
+      function initHelp() {
+          for (var i = 0; i < document.forms.length; i++) {
+              for (var j = 0; j < document.forms[i].elements.length; j++) {
+                  [%# MS decided to add fieldsets to the elements array; and 
+                    # Mozilla decided to copy this brokenness. Grr. 
+                    #%]
+                  if (document.forms[i].elements[j].tagName != 'FIELDSET') {
+                      document.forms[i].elements[j].onmouseover = showHelp;
+                  }
+              }
+          }
+
+          document.body.onclick = hideHelp;
+      }
+
+      function showHelp() {      
+          hideHelp();
+          var newHelp = document.getElementById(this.name + '_help');
+          if (newHelp) {
+              currentHelp = newHelp;
+
+              var mytop = this.offsetTop;
+              var myleft = this.offsetLeft;
+              var myparent = this.offsetParent;
+              while (myparent.tagName != 'BODY') {
+                  mytop = mytop + myparent.offsetTop;
+                  myleft = myleft + myparent.offsetLeft;
+                  myparent = myparent.offsetParent;
+              }
+
+              currentHelp.style.top = mytop + this.offsetHeight + 5 + "px";
+              currentHelp.style.left = myleft + "px";
+              currentHelp.style.display='';
+          }
+      }
+
+      function hideHelp() {
+          if (currentHelp) {
+              currentHelp.style.display='none';
+          }
+      }
+      </script>
+    [% END %]
+  [% END %]
+[% ELSE %]
+  [% IF help_block.defined && help_block.contains("initHelp") %]
     <script type="text/javascript">
-    var currentHelp;
-
-    function initHelp() {
-        for (var i = 0; i < document.forms.length; i++) {
-            for (var j = 0; j < document.forms[i].elements.length; j++) {
-                [%# MS decided to add fieldsets to the elements array; and 
-                  # Mozilla decided to copy this brokenness. Grr. 
-                  #%]
-                if (document.forms[i].elements[j].tagName != 'FIELDSET') {
-                    document.forms[i].elements[j].onmouseover = showHelp;
-                }
-            }
-        }
-
-        document.body.onclick = hideHelp;
-    }
-
-    function showHelp() {      
-        hideHelp();
-        var newHelp = document.getElementById(this.name + '_help');
-        if (newHelp) {
-            currentHelp = newHelp;
-
-            var mytop = this.offsetTop;
-            var myleft = this.offsetLeft;
-            var myparent = this.offsetParent;
-            while (myparent.tagName != 'BODY') {
-                mytop = mytop + myparent.offsetTop;
-                myleft = myleft + myparent.offsetLeft;
-                myparent = myparent.offsetParent;
-            }
-
-            currentHelp.style.top = mytop + this.offsetHeight + 5 + "px";
-            currentHelp.style.left = myleft + "px";
-            currentHelp.style.display='';
-        }
-    }
-
-    function hideHelp() {
-        if (currentHelp) {
-            currentHelp.style.display='none';
-        }
-    }
+    <!--
+    [%# Avoid warnings by having a dummy function %]
+    function initHelp() {}
+    //-->
     </script>
   [% END %]
-[% ELSE %]
-  <script type="text/javascript">
-  <!--
-  [%# Avoid warnings by having a dummy function %]
-  function initHelp() {}
-  // -->
-  </script>
 [% END %]
 
Index: mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
===================================================================
RCS file: /cvsroot/mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl,v
retrieving revision 1.28
diff -pu -r1.28 mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
--- mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
+++ mozilla/webtools/bugzilla/template/en/default/search/search-advanced.html.tmpl
@@ -38,6 +38,7 @@ var queryform = "queryform"
 [% PROCESS global/header.html.tmpl
   title = "Search for $terms.bugs"
   header = ""
+  help_block = "initHelp"
   onload = "doOnSelectProduct(0); initHelp();"
   javascript = js_data
   javascript_urls = [ "js/productform.js" ]