From 39eb8a92182c0eb78cabab0fa7c3864e52ed9ee6 Mon Sep 17 00:00:00 2001
From: gwoo <gwoo@cakephp.org>
Date: Sun, 20 Jan 2008 03:57:19 +0000
Subject: [PATCH] updating encoding in HtmlHelper::charset((), fixes #3937

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6395 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/view/helpers/html.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php
index 80bbe5ea4..8a4655797 100644
--- a/cake/libs/view/helpers/html.php
+++ b/cake/libs/view/helpers/html.php
@@ -255,9 +255,9 @@ class HtmlHelper extends AppHelper {
  */
 	function charset($charset = null) {
 		if (is_null($charset)) {
-			$charset = Configure::read('charset');
-			if (is_null($charset)) {
-				$charset = 'utf-8';
+			$charset = Configure::read('App.encoding');
+			if (!$charset) {
+				$charset = 'UTF-8';
 			}
 		}