summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@redhat.com>2014-05-19 21:00:50 +0200
committerDavid Lawrence <dkl@redhat.com>2014-05-19 21:00:50 +0200
commit9365f5f3c2720e0eaa0fb7ee40a0c5b201287843 (patch)
tree97970ccbec6a417e6178340c8c98f3e181d5e45a
parent3f35dd081156d231710553099f01f40481aa187a (diff)
downloadbugzilla-9365f5f3c2720e0eaa0fb7ee40a0c5b201287843.tar.gz
bugzilla-9365f5f3c2720e0eaa0fb7ee40a0c5b201287843.tar.xz
Bug 1009215 - add support for support.mozilla.org links to see_also
r=glob
-rw-r--r--Bugzilla/BugUrl.pm1
-rw-r--r--Bugzilla/BugUrl/MozSupport.pm36
-rw-r--r--template/en/default/global/user-error.html.tmpl1
3 files changed, 38 insertions, 0 deletions
diff --git a/Bugzilla/BugUrl.pm b/Bugzilla/BugUrl.pm
index 784600984..f59ec3601 100644
--- a/Bugzilla/BugUrl.pm
+++ b/Bugzilla/BugUrl.pm
@@ -70,6 +70,7 @@ use constant SUB_CLASSES => qw(
Bugzilla::BugUrl::MantisBT
Bugzilla::BugUrl::SourceForge
Bugzilla::BugUrl::GitHub
+ Bugzilla::BugUrl::MozSupport
);
###############################
diff --git a/Bugzilla/BugUrl/MozSupport.pm b/Bugzilla/BugUrl/MozSupport.pm
new file mode 100644
index 000000000..f78bec799
--- /dev/null
+++ b/Bugzilla/BugUrl/MozSupport.pm
@@ -0,0 +1,36 @@
+# 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::MozSupport;
+use strict;
+use base qw(Bugzilla::BugUrl);
+
+###############################
+#### Methods ####
+###############################
+
+sub should_handle {
+ my ($class, $uri) = @_;
+
+ # Mozilla support questions normally have the form:
+ # https://support.mozilla.org/<language>/questions/<id>
+ return ($uri->authority =~ /^support.mozilla.org$/i
+ and $uri->path =~ m|^(/[^/]+)?/questions/\d+$|) ? 1 : 0;
+}
+
+sub _check_value {
+ my ($class, $uri) = @_;
+
+ $uri = $class->SUPER::_check_value($uri);
+
+ # Support.mozilla.org redirects to https automatically
+ $uri->scheme('https');
+
+ return $uri;
+}
+
+1;
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index bd8e57a69..54d0f696a 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -275,6 +275,7 @@
<li>A b[% %]ug in a MantisBT installation.</li>
<li>A b[% %]ug on sourceforge.net.</li>
<li>An issue on github.com.</li>
+ <li>A question on support.mozilla.org</li>
</ul>
[% ELSIF reason == 'id' %]
There is no valid [% terms.bug %] id in that URL.