opensourcemirror
/
picocms
mirror of https://github.com/picocms/Pico.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Try to proberly encode formatted date strings returned by strftime() 

Fixes #560
This commit is contained in:
Daniel Rudolf 2020-09-09 17:52:11 +02:00
parent 0e2b124b8e
commit 4be1f6ae90
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -32,6 +32,7 @@
}, },
"require": { "require": {
"php": ">=5.3.6", "php": ">=5.3.6",
"ext-mbstring": "*",
"twig/twig": "^1.36", "twig/twig": "^1.36",
"symfony/yaml" : "^2.8", "symfony/yaml" : "^2.8",
"erusev/parsedown": "1.8.0-beta-7", "erusev/parsedown": "1.8.0-beta-7",

13
lib/Pico.php
View File

@ -1518,8 +1518,17 @@ class Pico
} }
if (empty($meta['date_formatted'])) { if (empty($meta['date_formatted'])) {
$dateFormat = $this->getConfig('date_format'); if ($meta['time']) {
$meta['date_formatted'] = $meta['time'] ? utf8_encode(strftime($dateFormat, $meta['time'])) : ''; $encodingList = mb_detect_order();
if ($encodingList === array('ASCII', 'UTF-8')) {
$encodingList[] = 'Windows-1252';
}
$rawFormattedDate = strftime($this->getConfig('date_format'), $meta['time']);
$meta['date_formatted'] = mb_convert_encoding($rawFormattedDate, 'UTF-8', $encodingList);
} else {
$meta['date_formatted'] = '';
}
} }
} else { } else {
// guarantee array key existance // guarantee array key existance