Merge pull request #189 from caioiglesias/master

Phil Sturgeon · Phil Sturgeon · commit 59c515421933 · 2013-02-11T11:59:50.000-08:00
http code 204 was coming out as 500
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
@@ -368,6 +368,12 @@ public function response($data = array(), $http_code = null)
 			$output = NULL;
 		}
 
+		// If data is empty but http code provided, keep the output empty
+		else if (empty($data) && is_numeric($http_code))
+		{
+			$output = NULL;
+		}
+
 		// Otherwise (if no data but 200 provided) or some data, carry on camping!
 		else
 		{

Original file line number	Diff line number	Diff line change
`@@ -368,6 +368,12 @@ public function response($data = array(), $http_code = null)`
`368`	`368`	`$output = NULL;`
`369`	`369`	`}`
`370`	`370`
	`371`	`+ // If data is empty but http code provided, keep the output empty`
	`372`	`+ else if (empty($data) && is_numeric($http_code))`
	`373`	`+ {`
	`374`	`+ $output = NULL;`
	`375`	`+ }`
	`376`	`+`
`371`	`377`	`// Otherwise (if no data but 200 provided) or some data, carry on camping!`
`372`	`378`	`else`
`373`	`379`	`{`