From 56e23fdd99dcb61750262f33730e9a83183b908a Mon Sep 17 00:00:00 2001
From: Kohei Yoshino <kohei.yoshino@gmail.com>
Date: Wed, 26 Sep 2018 13:29:32 -0400
Subject: Bug 1493490 - Remove navigator.buildID usage from Bugzilla Helper

---
 .../en/default/bug/create/comment-guided.txt.tmpl  |  2 --
 .../template/en/default/guided/guided.html.tmpl    |  1 -
 extensions/GuidedBugEntry/web/js/guided.js         |  3 ---
 .../en/default/bug/create/comment-guided.txt.tmpl  |  1 -
 .../en/default/bug/create/create-guided.html.tmpl  | 27 ----------------------
 5 files changed, 34 deletions(-)

diff --git a/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl b/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl
index 31408b538..153869f2f 100644
--- a/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl
@@ -1,8 +1,6 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 User Agent: [% cgi.param('user_agent') %]
-[% IF cgi.param('build_id') %]
-Build ID: [% cgi.param('build_id') %][% END %]
 [% IF cgi.param('firefox_for_android') %]
 Firefox for Android
 [% END %]
diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
index e1a9e0bc5..7e34e9920 100644
--- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
+++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl
@@ -351,7 +351,6 @@ Product: <b><span id="dupes_product_name">?</span></b>:
 <input type="hidden" name="comment" id="comment" value="">
 <input type="hidden" name="format" value="guided">
 <input type="hidden" name="user_agent" id="user_agent" value="">
-<input type="hidden" name="build_id" id="build_id" value="">
 
 <ul>
 <li>Please fill out this form clearly, precisely and in as much detail as you can manage.</li>
diff --git a/extensions/GuidedBugEntry/web/js/guided.js b/extensions/GuidedBugEntry/web/js/guided.js
index 77847fb2e..5f3543153 100644
--- a/extensions/GuidedBugEntry/web/js/guided.js
+++ b/extensions/GuidedBugEntry/web/js/guided.js
@@ -614,9 +614,6 @@ var bugForm = {
   onInit: function() {
     var user_agent = navigator.userAgent;
     Dom.get('user_agent').value = navigator.userAgent;
-    if (navigator.buildID && navigator.buildID != navigator.userAgent) {
-      Dom.get('build_id').value = navigator.buildID;
-    }
     Event.addListener(Dom.get('short_desc'), 'blur', function() {
       Dom.get('dupes_summary').value = Dom.get('short_desc').value;
       guided.setAdvancedLink();
diff --git a/template/en/default/bug/create/comment-guided.txt.tmpl b/template/en/default/bug/create/comment-guided.txt.tmpl
index baf390c18..3e9f84027 100644
--- a/template/en/default/bug/create/comment-guided.txt.tmpl
+++ b/template/en/default/bug/create/comment-guided.txt.tmpl
@@ -28,7 +28,6 @@
 [% USE Bugzilla %]
 [% cgi = Bugzilla.cgi %]
 User-Agent:       [%+ cgi.user_agent() %]
-Build Identifier: [%+ cgi.param("buildid") %]
 
 [%+ cgi.param("comment") IF cgi.param("comment") %]
 
diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl
index 9201eb977..cfdb0ba4e 100644
--- a/template/en/default/bug/create/create-guided.html.tmpl
+++ b/template/en/default/bug/create/create-guided.html.tmpl
@@ -228,33 +228,6 @@ function PutDescription() {
     </td>
   </tr>
 
-  [% IF product.name.match("Firefox|Camino|SeaMonkey") %]
-    [% matches = cgi.user_agent('Gecko/(\d+)') %]
-    [% buildid = cgi.user_agent() IF matches %]
-  [% END %]
-
-  [%# Accept URL parameter build ID for non-browser products %]
-  [% IF cgi.param("buildid") %]
-    [% buildid = cgi.param("buildid") %]
-  [% END %]
-
-  <tr bgcolor="[% tablecolour %]">
-    <td align="right" valign="top">
-      <b>Build Identifier</b>
-    </td>
-    <td valign="top">
-      <input type="text" size="80" name="buildid" value="[% buildid FILTER html %]">
-      <p>
-        This should identify the exact version of the product you were using.
-        If the above field is blank or you know it is incorrect, copy the
-        user agent text from the product's Help | Troubleshooting Information menu
-        (for browsers this will begin with "Mozilla/5.0...").
-        If the product won't start, instead paste the complete URL you downloaded
-        it from.
-      </p>
-    </td>
-  </tr>
-
   <tr>
     <td align="right" valign="top">
       <b>URL</b>
-- 
cgit v1.2.3-24-g4f1b