merged branch esgy/patch-1 (PR #8420)

fabpot · fabpot · commit af3118020504 · 2013-07-08T15:12:22.000+02:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8420). Discussion ---------- Update JsonResponse.php Added JSON_NUMERIC_CHECK flag to fix issues when json response is used in JavaScript apps and especially in AngularJS. Commits ------- 2b1c973 Update JsonResponse.php
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -83,7 +83,7 @@ public function setCallback($callback = null)
     public function setData($data = array())
     {
         // Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.
-        $this->data = json_encode($data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT);
+        $this->data = json_encode($data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT | JSON_NUMERIC_CHECK);
 
         return $this->update();
     }

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public function setCallback($callback = null)`
`83`	`83`	`public function setData($data = array())`
`84`	`84`	`{`
`85`	`85`	`// Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.`
`86`		`- $this->data = json_encode($data, JSON_HEX_TAG \| JSON_HEX_APOS \| JSON_HEX_AMP \| JSON_HEX_QUOT);`
	`86`	`+ $this->data = json_encode($data, JSON_HEX_TAG \| JSON_HEX_APOS \| JSON_HEX_AMP \| JSON_HEX_QUOT \| JSON_NUMERIC_CHECK);`
`87`	`87`
`88`	`88`	`return $this->update();`
`89`	`89`	`}`