Send charset=UTF-8 if Content-Type is JSON.

cakephp · Nov 18, 2012 · 9b47995 · 9b47995
1 parent ac0b9b2
commit 9b47995
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/Cake/Network/CakeResponse.php b/lib/Cake/Network/CakeResponse.php
@@ -409,8 +409,10 @@ protected function _setContentType() {
 		if (in_array($this->_status, array(304, 204))) {
 			return;
 		}
-		if (strpos($this->_contentType, 'text/') === 0 || $this->_contentType === 'application/json') {
+		if (strpos($this->_contentType, 'text/') === 0) {
 			$this->header('Content-Type', "{$this->_contentType}; charset={$this->_charset}");
+		} else if ($this->_contentType === 'application/json') {
+			$this->header('Content-Type', "{$this->_contentType}; charset=UTF-8");
 		} else {
 			$this->header('Content-Type', "{$this->_contentType}");
 		}