From: dklawren <dklawren@users.noreply.github.com>
Date: Wed, 14 Nov 2018 21:24:53 +0000 (-0500)
Subject: Bug 1504325 - Mozilla Gear Request form broken: The requested format gear does not... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76c6dcce3e1b58984e66c971234752c0d0e0d078;p=thirdparty%2Fbugzilla.git

Bug 1504325 - Mozilla Gear Request form broken: The requested format gear does not exist with a content type of html
---

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 1c9922f6e..58a1d02f9 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -2776,7 +2776,7 @@ sub app_startup {
       ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Developer Documentation', 'format' => 'doc' } );
     $r->any( '/:REWRITE_mdn' => [ REWRITE_mdn => qr{form[\.:]mdn?} ] )
       ->to( 'CGI#enter_bug_cgi' => { 'format' => 'mdn', 'product' => 'developer.mozilla.org' } );
-    $r->any( '/:REWRITE_swag_gear' => [ REWRITE_swag_gear => qr{form[\.:](swag|gear)} ] )
+    $r->any( '/:REWRITE_swag_gear' => [ REWRITE_swag_gear => qr{form[\.:](?:swag|gear)} ] )
       ->to( 'CGI#enter_bug_cgi' => { 'format' => 'swag', 'product' => 'Marketing' } );
     $r->any( '/:REWRITE_costume' => [ REWRITE_costume => qr{form[\.:]costume} ] )
       ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Marketing', 'format' => 'costume' } );
@@ -2806,7 +2806,7 @@ sub app_startup {
       ->to( 'CGI#enter_bug_cgi' => { 'product' => 'FSA', 'format' => 'fsa-budget' } );
     $r->any( '/:REWRITE_triage_request' => [ REWRITE_triage_request => qr{form[\.:]triage[\.\-]request} ] )
       ->to( 'CGI#page_cgi' => { 'id' => 'triage_request.html' } );
-    $r->any( '/:REWRITE_crm_CRM' => [ REWRITE_crm_CRM => qr{form[\.:](crm|CRM)} ] )
+    $r->any( '/:REWRITE_crm_CRM' => [ REWRITE_crm_CRM => qr{form[\.:](?:crm|CRM)} ] )
       ->to( 'CGI#enter_bug_cgi' => { 'format' => 'crm', 'product' => 'Marketing' } );
     $r->any( '/:REWRITE_nda' => [ REWRITE_nda => qr{form[\.:]nda} ] )
       ->to( 'CGI#enter_bug_cgi' => { 'product' => 'Legal', 'format' => 'nda' } );