Merge pull request chriskacerguis#409 from darkwhispering/ci-input-class-conflict-fix

Fix for issue chriskacerguis#408

Author: chriskacerguis

application/libraries/REST_Controller.php

@@ -961,7 +961,9 @@ protected function _parse_put()
 
         // If no file type is provided, this is probably just arguments
         else {
-            parse_str(file_get_contents('php://input'), $this->_put_args);
+            if ($this->input->method() == 'put') {
+                $this->_put_args = $this->input->input_stream();
+            }
         }
 
     }
@@ -1002,7 +1004,9 @@ protected function _parse_patch()
 
         // If no file type is provided, this is probably just arguments
         else {
-            parse_str(file_get_contents('php://input'), $this->_patch_args);
+            if ($this->input->method() == 'patch') {
+                $this->_patch_args = $this->input->input_stream();
+            }
         }
     }
 
@@ -1012,7 +1016,9 @@ protected function _parse_patch()
     protected function _parse_delete()
     {
         // Set up out DELETE variables (which shouldn't really exist, but sssh!)
-        parse_str(file_get_contents('php://input'), $this->_delete_args);
+        if ($this->input->method() == 'delete') {
+            $this->_delete_args = $this->input->input_stream();
+        }
     }
 
     // INPUT FUNCTION --------------------------------------------------------------