mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-19 02:56:15 +00:00
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:
parent
d901e0af31
commit
39eb8a9218
1 changed files with 3 additions and 3 deletions
|
@ -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';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue