Merge 'mabe/CodeOptimations'

Conflicts: library/Zend/Feed/Reader/Reader.php
zendframework · Jul 29, 2010 · 6f66646 · 6f66646
8 parents 5597c0a + cf3e018 + 490086e + 50418c6 + 0b49cb4 + 325fdd2 + 0c61247 + 9ad7896
commit 6f66646
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -963,11 +963,10 @@ public function getLastMethod()
     public function _doRequest(Client\Common $client, $request, $location, $action, $version, $one_way = null)
     {
         // Perform request as is
-        if ($one_way == null) {
-            return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version);
-        } else {
-            return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version, $one_way);
+        if ($one_way === null) {
+            return $client->__doRequest($request, $location, $action, $version);
         }
+        return $client->__doRequest($request, $location, $action, $version, $one_way);
     }
 
     /**