From cbb5f2793ceb96c072af1a662eba5e96bf38e180 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sat, 19 Jul 2014 17:12:13 +0200 Subject: Fix 526 (cherry picked from commit 071f22c5c038c962823af003a28663d0d2734a16) --- framework/Web/Services/TRpcService.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'framework/Web/Services/TRpcService.php') diff --git a/framework/Web/Services/TRpcService.php b/framework/Web/Services/TRpcService.php index a2691af4..546ab82a 100644 --- a/framework/Web/Services/TRpcService.php +++ b/framework/Web/Services/TRpcService.php @@ -480,7 +480,6 @@ class TJsonRpcProtocol extends TRpcProtocol if(!is_array($parameters)) $parameters = array($parameters); - $ret = $this->callApiMethod($_request['method'], $parameters); // a request without an id is a notification that doesn't need a response if($this->_id !== null) { @@ -489,7 +488,7 @@ class TJsonRpcProtocol extends TRpcProtocol return $this->encode(array( 'jsonrpc' => '2.0', 'id' => $this->_id, - 'result' => $ret + 'result' => $this->callApiMethod($_request['method'], $parameters); )); } else { return $this->encode(array( -- cgit v1.2.3 From 7268de30b0d7e4e29c87341d9bd9d39f152674d3 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 22 Jul 2014 10:32:36 +0200 Subject: fix #527 (cherry picked from commit 064bf94147a90234007c8a124ba7bd9fc27fc0cd) --- framework/Web/Services/TRpcService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'framework/Web/Services/TRpcService.php') diff --git a/framework/Web/Services/TRpcService.php b/framework/Web/Services/TRpcService.php index 546ab82a..a4ed3d7c 100644 --- a/framework/Web/Services/TRpcService.php +++ b/framework/Web/Services/TRpcService.php @@ -488,7 +488,7 @@ class TJsonRpcProtocol extends TRpcProtocol return $this->encode(array( 'jsonrpc' => '2.0', 'id' => $this->_id, - 'result' => $this->callApiMethod($_request['method'], $parameters); + 'result' => $this->callApiMethod($_request['method'], $parameters), )); } else { return $this->encode(array( -- cgit v1.2.3