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

Catch YAML parse errors

Browse Source
This commit is contained in:
Daniel Rudolf 2015-11-29 20:58:41 +01:00
parent 6cb378e83f
commit 5ea94d06e6
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Pico.php
View File

@ -753,6 +753,8 @@ class Pico
* @param string $rawContent the raw file contents * @param string $rawContent the raw file contents
* @param string[] $headers known meta headers * @param string[] $headers known meta headers
* @return array parsed meta data * @return array parsed meta data
* @throws \Symfony\Component\Yaml\Exception\ParseException thrown when the
* meta data is invalid
*/ */
public function parseFileMeta($rawContent, array $headers) public function parseFileMeta($rawContent, array $headers)
{ {
@ -955,12 +957,23 @@ class Pico
$url = $this->getPageUrl($id); $url = $this->getPageUrl($id);
if ($file != $this->requestFile) { if ($file != $this->requestFile) {
$rawContent = file_get_contents($file); $rawContent = file_get_contents($file);
$meta = $this->parseFileMeta($rawContent, $this->getMetaHeaders());
$headers = $this->getMetaHeaders();
try {
$meta = $this->parseFileMeta($rawContent, $headers);
} catch (\Symfony\Component\Yaml\Exception\ParseException $e) {
$meta = array_fill_keys(array_keys($headers), '');
$meta['time'] = $meta['date_formatted'] = '';
$meta['YAML_ParseError'] = $e->getMessage();
}
} else { } else {
$rawContent = &$this->rawContent; $rawContent = &$this->rawContent;
$meta = &$this->meta; $meta = &$this->meta;
} }
// fallback to page id if page title is empty
$meta['title'] = (!empty($meta['title'])) ? $meta['title'] : $id;
// build page data // build page data
// title, description, author and date are assumed to be pretty basic data // title, description, author and date are assumed to be pretty basic data
// everything else is accessible through $page['meta'] // everything else is accessible through $page['meta']