From d85abfea5c720cd07d4a7358138b55f34af98c8d Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Tue, 26 May 2015 10:55:05 +0800 Subject: Bug 1168190: "See Also" should accept webcompat.com/issues/ - prefixed URLs --- Bugzilla/BugUrl.pm | 1 + Bugzilla/BugUrl/WebCompat.pm | 35 +++++++++++++++++++++++++ template/en/default/global/user-error.html.tmpl | 1 + 3 files changed, 37 insertions(+) create mode 100644 Bugzilla/BugUrl/WebCompat.pm 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 @@
  • A b[% %]ug on sourceforge.net.
  • An issue on github.com.
  • A question on support.mozilla.org
  • +
  • An issue on webcompat.com.
  • [% ELSIF reason == 'id' %] There is no valid [% terms.bug %] id in that URL. -- cgit v1.2.3-24-g4f1b