add _jsonOptions

cakephp · Nov 20, 2013 · 03aa24f · 03aa24f
1 parent 86f08c9
commit 03aa24f
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/Cake/View/JsonView.php b/Cake/View/JsonView.php
@@ -146,11 +146,16 @@ protected function _serialize($serialize) {
 			$data = isset($this->viewVars[$serialize]) ? $this->viewVars[$serialize] : null;
 		}
 
+		$jsonOptions = JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT;
+		if (isset($this->viewVars['_jsonOptions'])) {
+			$jsonOptions = $this->viewVars['_jsonOptions'];
+		}
+
 		if (Configure::read('debug')) {
-			return json_encode($data, JSON_PRETTY_PRINT);
+			return json_encode($data, $jsonOptions | JSON_PRETTY_PRINT);
 		}
 
-		return json_encode($data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT);
+		return json_encode($data, $jsonOptions);
 	}
 
 }