From: Gervase Markham <gerv@gerv.net>
Date: Mon, 24 Nov 2014 19:34:21 +0000 (+0000)
Subject: Oops. Revert commit with bogus message #1. paperbag=gerv.
X-Git-Tag: release-5.1.1~446
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a395c71859f00992051d53dfdbe7e4597d18100f;p=thirdparty%2Fbugzilla.git

Oops. Revert commit with bogus message #1. paperbag=gerv.

This reverts commit 9e1efb5e001b8540672f42bfd7101fed4a394c0e.
---

diff --git a/Bugzilla/BugUrl/SourceForge.pm b/Bugzilla/BugUrl/SourceForge.pm
index 4a330f34b3..acba0df28b 100644
--- a/Bugzilla/BugUrl/SourceForge.pm
+++ b/Bugzilla/BugUrl/SourceForge.pm
@@ -22,18 +22,12 @@ sub should_handle {
 
     # SourceForge tracker URLs have only one form:
     #  http://sourceforge.net/tracker/?func=detail&aid=111&group_id=111&atid=111
-    # SourceForge Allura ticket URLs have several forms:
-    #  http://sourceforge.net/p/project/bugs/12345/
-    #  http://sourceforge.net/p/project/feature-requests/12345/
-    #  http://sourceforge.net/p/project/patches/12345/
-    #  http://sourceforge.net/p/project/support-requests/12345/
     return (lc($uri->authority) eq 'sourceforge.net'
-            and (($uri->path eq '/tracker/'
-                  and $uri->query_param('func') eq 'detail'
-                  and $uri->query_param('aid')
-                  and $uri->query_param('group_id')
-                  and $uri->query_param('atid'))
-                or $uri->path =~ m!^/p/[^/]+/(?:bugs|feature-requests|patches|support-requests)/\d+/?$!)) ? 1 : 0;
+            and $uri->path =~ m|/tracker/|
+            and $uri->query_param('func') eq 'detail'
+            and $uri->query_param('aid')
+            and $uri->query_param('group_id')
+            and $uri->query_param('atid')) ? 1 : 0;
 }
 
 sub _check_value {
@@ -44,11 +38,6 @@ sub _check_value {
     # Remove any # part if there is one.
     $uri->fragment(undef);
 
-    # Make sure the trailing slash is present
-    my $path = $uri->path;
-    $path =~ s!/*$!/!;
-    $uri->path($path);
-
     return $uri;
 }
 
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 015f18525a..78d8823f5c 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -291,7 +291,7 @@
         <li>An issue in a JIRA installation.</li>
         <li>A ticket in a Trac installation.</li>
         <li>A b[% %]ug in a MantisBT installation.</li>
-        <li>A b[% %]ug or ticket on sourceforge.net.</li>
+        <li>A b[% %]ug on sourceforge.net.</li>
         <li>An issue/pull request on github.com.</li>
         [% Hook.process('bug_url_invalid_tracker') %]
       </ul>