summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-05-26 04:55:05 +0200
committerByron Jones <glob@mozilla.com>2015-05-26 04:55:05 +0200
commitd85abfea5c720cd07d4a7358138b55f34af98c8d (patch)
treed4a3ca6e9e04d2b9c955d52066c3f5e7482f258f
parentc115cd019aae6f7c96932eda67ce0336b8f2525b (diff)
downloadbugzilla-d85abfea5c720cd07d4a7358138b55f34af98c8d.tar.gz
bugzilla-d85abfea5c720cd07d4a7358138b55f34af98c8d.tar.xz
Bug 1168190: "See Also" should accept webcompat.com/issues/ - prefixed URLs
-rw-r--r--Bugzilla/BugUrl.pm1
-rw-r--r--Bugzilla/BugUrl/WebCompat.pm35
-rw-r--r--template/en/default/global/user-error.html.tmpl1
3 files changed, 37 insertions, 0 deletions
diff --git a/Bugzilla/BugUrl.pm b/Bugzilla/BugUrl.pm
index f59ec3601..c5974d4ad 100644
--- a/Bugzilla/BugUrl.pm
+++ b/Bugzilla/BugUrl.pm
@@ -71,6 +71,7 @@ use constant SUB_CLASSES => qw(
Bugzilla::BugUrl::SourceForge
Bugzilla::BugUrl::GitHub
Bugzilla::BugUrl::MozSupport
+ Bugzilla::BugUrl::WebCompat
);
###############################
diff --git a/Bugzilla/BugUrl/WebCompat.pm b/Bugzilla/BugUrl/WebCompat.pm
new file mode 100644
index 000000000..0c0138abc
--- /dev/null
+++ b/Bugzilla/BugUrl/WebCompat.pm
@@ -0,0 +1,35 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This Source Code Form is "Incompatible With Secondary Licenses", as
+# defined by the Mozilla Public License, v. 2.0.
+
+package Bugzilla::BugUrl::WebCompat;
+use strict;
+use base qw(Bugzilla::BugUrl);
+
+###############################
+#### Methods ####
+###############################
+
+sub should_handle {
+ my ($class, $uri) = @_;
+
+ # https://webcompat.com/issues/1111
+ my $host = lc($uri->authority);
+ return
+ ($host eq 'webcompat.com' || $host eq 'www.webcompat.com')
+ && $uri->path =~ m#^/issues/\d+$#;
+}
+
+sub _check_value {
+ my ($class, $uri) = @_;
+ $uri = $class->SUPER::_check_value($uri);
+ # force https and drop www from host
+ $uri->scheme('https');
+ $uri->authority('webcompat.com');
+ return $uri;
+}
+
+1;
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 10c31b59f..082649947 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -301,6 +301,7 @@
<li>A b[% %]ug on sourceforge.net.</li>
<li>An issue on github.com.</li>
<li>A question on support.mozilla.org</li>
+ <li>An issue on webcompat.com.</li>
</ul>
[% ELSIF reason == 'id' %]
There is no valid [% terms.bug %] id in that URL.