adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-02-07 12:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5610 from dmromanov/patch-2

Browse source 
Fix double encoding time strings (CakeTime)
This commit is contained in:
José Lorenzo Rodríguez 2015-01-08 22:46:27 +01:00
commit 642e11e728
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Utility/CakeTime.php
View file

@ -1138,7 +1138,7 @@ class CakeTime {
if (function_exists('mb_check_encoding')) { if (function_exists('mb_check_encoding')) {
$valid = mb_check_encoding($format, $encoding); $valid = mb_check_encoding($format, $encoding);
} else { } else {
$valid = !Multibyte::checkMultibyte($format); $valid = Multibyte::checkMultibyte($format);
} }
if (!$valid) { if (!$valid) {
$format = utf8_encode($format); $format = utf8_encode($format);