From 247cf99360447b4dd6d64028fa26caec3b9d8433 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 9 Apr 2012 13:00:35 +0000
Subject: [PATCH] Error mode 4 is already used by ERROR_MODE_TEST, and so
 ERROR_MODE_AJAX must use another ID

git-svn-id: svn://10.0.0.236/trunk@263654 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/testopia/.bzrrev                            | 2 +-
 .../extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php  | 2 +-
 .../webtools/testopia/extensions/Testopia/lib/Constants.pm   | 2 +-
 mozilla/webtools/testopia/extensions/Testopia/patch-4.0      | 5 +++--
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mozilla/webtools/testopia/.bzrrev b/mozilla/webtools/testopia/.bzrrev
index 73835932642..929530e883b 100644
--- a/mozilla/webtools/testopia/.bzrrev
+++ b/mozilla/webtools/testopia/.bzrrev
@@ -1 +1 @@
-652
\ No newline at end of file
+653
\ No newline at end of file
diff --git a/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php b/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php
index 0a25c7a6dbc..14db326b86d 100644
--- a/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php
+++ b/mozilla/webtools/testopia/extensions/Testopia/contrib/drivers/php/.xmlrpc.inc.php
@@ -1,7 +1,7 @@
 <?php
 // by Edd Dumbill (C) 1999-2002
 // <edd@usefulinc.com>
-// $Id: .xmlrpc.inc.php,v 1.15 2012-04-09 12:45:33 mkanat%bugzilla.org Exp $
+// $Id: .xmlrpc.inc.php,v 1.16 2012-04-09 13:00:35 mkanat%bugzilla.org Exp $
 
 // Copyright (c) 1999,2000,2002 Edd Dumbill.
 // All rights reserved.
diff --git a/mozilla/webtools/testopia/extensions/Testopia/lib/Constants.pm b/mozilla/webtools/testopia/extensions/Testopia/lib/Constants.pm
index 4bbfad2ca66..f067504287f 100644
--- a/mozilla/webtools/testopia/extensions/Testopia/lib/Constants.pm
+++ b/mozilla/webtools/testopia/extensions/Testopia/lib/Constants.pm
@@ -63,7 +63,7 @@ TIME_FORMAT
 
 use constant TESTOPIA_VERSION => "2.5";
 
-use constant ERROR_MODE_AJAX => 4;
+use constant ERROR_MODE_AJAX => 5;
 
 # Test Case Status
 use constant PROPOSED  => 1;
diff --git a/mozilla/webtools/testopia/extensions/Testopia/patch-4.0 b/mozilla/webtools/testopia/extensions/Testopia/patch-4.0
index 59c46fd75d4..3519be01fe3 100644
--- a/mozilla/webtools/testopia/extensions/Testopia/patch-4.0
+++ b/mozilla/webtools/testopia/extensions/Testopia/patch-4.0
@@ -9,11 +9,12 @@
  
  # We cannot use $^S to detect if we are in an eval(), because mod_perl
  # already eval'uates everything, so $^S = 1 in all cases under mod_perl!
-@@ -150,6 +151,16 @@
+@@ -150,6 +151,17 @@
                  $server->response($server->error_response_header);
              }
          }
-+        elsif (Bugzilla->error_mode == ERROR_MODE_AJAX) {
++        # ERROR_MODE_AJAX = 5, but we cannot use ERROR_MODE_AJAX from here.
++        elsif (Bugzilla->error_mode == 5) {
 +            # JSON can't handle strings across lines. 
 +            $message =~ s/\n/ /gm;
 +            my $err;