Bug 276907: Don't linkify javascript: or data: URLs in the URL field on a bug.

Patch by Gervase Markham <gerv@mozilla.org>, backported to 2.16 branch by Myk Melez <myk@mozilla.org>
r= justdave,vladd, a= justdave

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 28effd3614d3d3c66874238ff338dc297815f66b..7fb0199c9d8eb5126876447a763ea7e0677f3640 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -199,7 +199,8 @@
   <tr>
     <td align="right">
       <b>
-        [% IF bug.bug_file_loc %]
+        [% IF bug.bug_file_loc 
+           AND NOT bug.bug_file_loc.match("^(javascript|data)") %]
           <a href="[% bug.bug_file_loc FILTER html %]">URL</a>:
         [% ELSE %]
           URL:

diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 60d23ce059e6a4831382583a362abccc0e1f7bb6..dcda9fda6f6fc404e12838af6137761a16d2b8de 100644 (file)
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -104,8 +104,13 @@
     <tr>
       <td colspan="4">
         <b>URL:</b>&nbsp;
-        <a href="[% bug.bug_file_loc FILTER html %]">
-                 [% bug.bug_file_loc FILTER html %]</a> 
+        [% IF bug.bug_file_loc 
+           AND NOT bug.bug_file_loc.match("^(javascript|data)") %]
+          <a href="[% bug.bug_file_loc FILTER html %]">
+                   [% bug.bug_file_loc FILTER html %]</a>
+        [% ELSE %]
+          [% bug.bug_file_loc FILTER html %]
+        [% END %]
     </tr>
     
     <tr>