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

9 years ago · 6234be88b0
parent 3a36dbd934
commit 6234be88b0
1 changed files with 2 additions and 1 deletions
--- a/lib/Pico.php
+++ b/lib/Pico.php
@ -298,7 +298,8 @@ class Pico
        // load raw file content
        $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);
        } else {
            $this->triggerEvent('on404ContentLoading', array(&$this->requestFile));