summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Template.pm
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2013-09-27 18:07:51 +0200
committerDave Lawrence <dlawrence@mozilla.com>2013-09-27 18:07:51 +0200
commit0048909dbe4141af69eaf930562c3e8f653dbe0d (patch)
tree3e24f8d9db7e83846db69d66c64d1261186270ad /Bugzilla/Template.pm
parent0228e2ab199a9b2b0287f3aa02a0f607e22e4054 (diff)
downloadbugzilla-0048909dbe4141af69eaf930562c3e8f653dbe0d.tar.gz
bugzilla-0048909dbe4141af69eaf930562c3e8f653dbe0d.tar.xz
Revert Bug 917669 - invalid or expired authentication tokens and cookies should throw errors, not be silently ignored
Diffstat (limited to 'Bugzilla/Template.pm')
-rw-r--r--Bugzilla/Template.pm5
1 files changed, 4 insertions, 1 deletions
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;