From 0048909dbe4141af69eaf930562c3e8f653dbe0d Mon Sep 17 00:00:00 2001
From: Dave Lawrence <dlawrence@mozilla.com>
Date: Fri, 27 Sep 2013 12:07:51 -0400
Subject: Revert Bug 917669 - invalid or expired authentication tokens and
 cookies should throw errors, not be silently ignored

---
 Bugzilla/Template.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/Template.pm')

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 81202965c..434e49da5 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -824,7 +824,10 @@ sub create {
                 # (Wrapping the message in the WebService is unnecessary
                 # and causes awkward things like \n's appearing in error
                 # messages in JSON-RPC.)
-                unless (i_am_webservice()) {
+                unless (Bugzilla->usage_mode == USAGE_MODE_JSON
+                        or Bugzilla->usage_mode == USAGE_MODE_XMLRPC
+                        or Bugzilla->usage_mode == USAGE_MODE_REST)
+                {
                     $var = wrap_comment($var, 72);
                 }
                 $var =~ s/\&nbsp;/ /g;
-- 
cgit v1.2.3-24-g4f1b