SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Support content files with UTF-8 BOM

Browse Source 
Resolves #461
This commit is contained in:
Daniel Rudolf 2019-10-20 15:16:40 +02:00
parent d95c9d3708
commit 1d5aba46af
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Pico.php
View File

@ -1477,7 +1477,7 @@ class Pico
public function parseFileMeta($rawContent, array $headers) public function parseFileMeta($rawContent, array $headers)
{ {
$meta = array(); $meta = array();
$pattern = "/^(\/(\*)|---)[[:blank:]]*(?:\r)?\n" $pattern = "/^(?:\xEF\xBB\xBF)?(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
. "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s"; . "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s";
if (preg_match($pattern, $rawContent, $rawMetaMatches) && isset($rawMetaMatches[3])) { if (preg_match($pattern, $rawContent, $rawMetaMatches) && isset($rawMetaMatches[3])) {
$meta = $this->getYamlParser()->parse($rawMetaMatches[3]) ?: array(); $meta = $this->getYamlParser()->parse($rawMetaMatches[3]) ?: array();
@ -1581,7 +1581,7 @@ class Pico
public function prepareFileContent($rawContent, array $meta = array()) public function prepareFileContent($rawContent, array $meta = array())
{ {
// remove meta header // remove meta header
$metaHeaderPattern = "/^(\/(\*)|---)[[:blank:]]*(?:\r)?\n" $metaHeaderPattern = "/^(?:\xEF\xBB\xBF)?(\/(\*)|---)[[:blank:]]*(?:\r)?\n"
. "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s"; . "(?:(.*?)(?:\r)?\n)?(?(2)\*\/|---)[[:blank:]]*(?:(?:\r)?\n|$)/s";
$markdown = preg_replace($metaHeaderPattern, '', $rawContent, 1); $markdown = preg_replace($metaHeaderPattern, '', $rawContent, 1);