Always use on404Content... execution path when serving a 404.md

This commit is contained in:
Daniel Rudolf 2016-04-24 04:06:04 +02:00
parent 3a36dbd934
commit 6234be88b0
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538

View File

@ -298,7 +298,8 @@ class Pico
// load raw file content // load raw file content
$this->triggerEvent('onContentLoading', array(&$this->requestFile)); $this->triggerEvent('onContentLoading', array(&$this->requestFile));
if (file_exists($this->requestFile)) { $notFoundFile = '404' . $this->getConfig('content_ext');
if (file_exists($this->requestFile) && (basename($this->requestFile) !== $notFoundFile)) {
$this->rawContent = $this->loadFileContent($this->requestFile); $this->rawContent = $this->loadFileContent($this->requestFile);
} else { } else {
$this->triggerEvent('on404ContentLoading', array(&$this->requestFile)); $this->triggerEvent('on404ContentLoading', array(&$this->requestFile));