From 7dc675fedb5b2631a8bafd0fb691eac485eff0af Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Tue, 4 Nov 2014 13:38:46 +0800
Subject: Bug 1092037: backport bug 1062739 to bmo (add the ability for
 administrators to limit the number of emails sent to a user per minute and
 hour)

---
 extensions/BMO/Extension.pm                                        | 3 +--
 extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'extensions/BMO')

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 5ada4eb72..9e900a381 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -169,8 +169,7 @@ sub page_before_template {
         Bugzilla::Extension::BMO::Reports::Groups::members_report($vars);
     }
     elsif ($page eq 'email_queue.html') {
-        require Bugzilla::Extension::BMO::Reports::EmailQueue;
-        Bugzilla::Extension::BMO::Reports::EmailQueue::report($vars);
+        print Bugzilla->cgi->redirect('view_job_queue.cgi');
     }
     elsif ($page eq 'release_tracking_report.html') {
         require Bugzilla::Extension::BMO::Reports::ReleaseTracking;
diff --git a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
index 93f04c4fa..fd48130eb 100644
--- a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
@@ -51,7 +51,7 @@
   [% IF user.in_group('admin') || user.in_group('infra') %]
     <li>
       <strong>
-        <a href="[% urlbase FILTER none %]page.cgi?id=email_queue.html">Email Queue</a>
+        <a href="[% urlbase FILTER none %]view_job_queue.cgi">Email Queue</a>
       </strong> - TheSchwartz queue
     </li>
   [% END %]
-- 
cgit v1.2.3-24-g4f1b