check for parsed HTTP params in body before using XML/JSON

frapi · May 27, 2011 · 23ecbdb · 23ecbdb
1 parent 78ed244
commit 23ecbdb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/frapi/library/Frapi/Controller/Api.php b/src/frapi/library/Frapi/Controller/Api.php
@@ -185,7 +185,7 @@ public function processError(Frapi_Exception $e)
     public static function processInternalError(Frapi_Exception $e)
     {
         try {
-            $controller = new Frapi_Controller_API();
+            $controller = new Frapi_Controller_Api();
         } catch (Exception $e) {
             // This is a hack to intercept anything that may
             // have happened before the internal error collection

diff --git a/src/frapi/library/Frapi/Controller/Main.php b/src/frapi/library/Frapi/Controller/Main.php
@@ -334,7 +334,7 @@ public function getParams()
             $xmlJsonMatch = preg_grep('/\<|\{/i', array_keys($puts));
             $inputFormat = $this->getFormat();
         }
-        if (!empty($inputFormat) || !empty($xmlJsonMatch)) {
+        if (empty($puts) && !empty($inputFormat) || !empty($xmlJsonMatch)) {
             /* attempt to parse the input */
             $requestBody = Frapi_Input_RequestBodyParser::parse(
                 $inputFormat,