Merge pull request chriskacerguis#669 from pberndro/patch-1

chriskacerguis · web-flow · commit 95fd1b00ed8a · 2016-07-08T11:20:13.000-05:00
fix json_encode for integer values
diff --git a/application/libraries/Format.php b/application/libraries/Format.php
@@ -403,14 +403,14 @@ public function to_json($data = NULL)
 
         if (empty($callback) === TRUE)
         {
-            return json_encode($data);
+            return json_encode($data, JSON_NUMERIC_CHECK);
         }
 
         // We only honour a jsonp callback which are valid javascript identifiers
         elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
         {
             // Return the data as encoded json with a callback
-            return $callback.'('.json_encode($data).');';
+            return $callback.'('.json_encode($data, JSON_NUMERIC_CHECK).');';
         }
 
         // An invalid jsonp callback function provided.

Original file line number	Diff line number	Diff line change
`@@ -403,14 +403,14 @@ public function to_json($data = NULL)`
`403`	`403`
`404`	`404`	`if (empty($callback) === TRUE)`
`405`	`405`	`{`
`406`		`- return json_encode($data);`
	`406`	`+ return json_encode($data, JSON_NUMERIC_CHECK);`
`407`	`407`	`}`
`408`	`408`
`409`	`409`	`// We only honour a jsonp callback which are valid javascript identifiers`
`410`	`410`	`elseif (preg_match('/^[a-z_\$][a-z0-9\$_](\.[a-z_\$][a-z0-9\$_])*$/i', $callback))`
`411`	`411`	`{`
`412`	`412`	`// Return the data as encoded json with a callback`
`413`		`- return $callback.'('.json_encode($data).');';`
	`413`	`+ return $callback.'('.json_encode($data, JSON_NUMERIC_CHECK).');';`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`// An invalid jsonp callback function provided.`