summaryrefslogtreecommitdiffstats
path: root/Bugzilla/WebService
diff options
context:
space:
mode:
authorDave Lawrence <dlawrence@mozilla.com>2012-01-09 21:56:56 +0100
committerDave Lawrence <dlawrence@mozilla.com>2012-01-09 21:56:56 +0100
commit5bb3d3fb55bc19823a55c0e48322021a5c556394 (patch)
tree41b8a33080ead49f6632f4c8c5c71c017f9df757 /Bugzilla/WebService
parent0c449e2d96804f6e48d3812b42ccf407fbbeb747 (diff)
parented87a68c9fa5c099c79f45bb6f3ab95e42f14002 (diff)
downloadbugzilla-5bb3d3fb55bc19823a55c0e48322021a5c556394.tar.gz
bugzilla-5bb3d3fb55bc19823a55c0e48322021a5c556394.tar.xz
merge with bugzilla/4.2
Diffstat (limited to 'Bugzilla/WebService')
-rw-r--r--Bugzilla/WebService/Server/JSONRPC.pm13
1 files changed, 12 insertions, 1 deletions
diff --git a/Bugzilla/WebService/Server/JSONRPC.pm b/Bugzilla/WebService/Server/JSONRPC.pm
index 8fe724080..3b232aafa 100644
--- a/Bugzilla/WebService/Server/JSONRPC.pm
+++ b/Bugzilla/WebService/Server/JSONRPC.pm
@@ -22,7 +22,18 @@
package Bugzilla::WebService::Server::JSONRPC;
use strict;
-use base qw(JSON::RPC::Server::CGI Bugzilla::WebService::Server);
+use Bugzilla::WebService::Server;
+BEGIN {
+ our @ISA = qw(Bugzilla::WebService::Server);
+
+ if (eval { require JSON::RPC::Server::CGI }) {
+ unshift(@ISA, 'JSON::RPC::Server::CGI');
+ }
+ else {
+ require JSON::RPC::Legacy::Server::CGI;
+ unshift(@ISA, 'JSON::RPC::Legacy::Server::CGI');
+ }
+}
use Bugzilla::Error;
use Bugzilla::WebService::Constants;