Merge pull request #5610 from dmromanov/patch-2

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

View file

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