Merge pull request chriskacerguis#218 from moberemk/master

Phil Sturgeon · Phil Sturgeon · commit 22a6c75e9d54 · 2013-08-16T09:05:37.000-07:00
Added proper JSON numeric formatting
diff --git a/application/libraries/Format.php b/application/libraries/Format.php
@@ -209,7 +209,11 @@ public function to_csv()
 	// Encode as JSON
 	public function to_json()
 	{
-		return json_encode($this->_data);
+	    if (strnatcmp(phpversion(),'5.3.3') >= 0) {
+		return json_encode($this->_data, JSON_NUMERIC_CHECK);
+	    } else {
+	    	return json_encode($this->_data);
+	    }		
 	}
 
 	// Encode as Serialized array
@@ -267,4 +271,4 @@ private function _from_serialize($string)
 
 }
 
-/* End of file format.php */
+/* End of file format.php */

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,11 @@ public function to_csv()`
`209`	`209`	`// Encode as JSON`
`210`	`210`	`public function to_json()`
`211`	`211`	`{`
`212`		`- return json_encode($this->_data);`
	`212`	`+ if (strnatcmp(phpversion(),'5.3.3') >= 0) {`
	`213`	`+ return json_encode($this->_data, JSON_NUMERIC_CHECK);`
	`214`	`+ } else {`
	`215`	`+ return json_encode($this->_data);`
	`216`	`+ }`
`213`	`217`	`}`
`214`	`218`
`215`	`219`	`// Encode as Serialized array`
`@@ -267,4 +271,4 @@ private function _from_serialize($string)`
`267`	`271`
`268`	`272`	`}`
`269`	`273`
`270`		`-/* End of file format.php */`
	`274`	`+/* End of file format.php */`