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
This commit is contained in:
gwoo 2008-01-20 03:57:19 +00:00
parent d901e0af31
commit 39eb8a9218

View file

@ -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';
}
}