mikuli.cz

commit df9b37d23851fc699e3b8af782513bb5f41e6767
parent 6d7214f01e6bbad3346c988fd5dc09ca6da7e856
Author: markseu <mark2011@mayberg.se>
Date:   Wed, 21 Oct 2020 15:51:03 +0200

Updated core, error page

Diffstat:
M
system/extensions/core.php
 | 
11
+++++++----
M
system/extensions/update-current.ini
 | 
4
++--

2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/system/extensions/core.php b/system/extensions/core.php
@@ -2,7 +2,7 @@
 // Core extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/core
 
 class YellowCore {
-    const VERSION = "0.8.23";
+    const VERSION = "0.8.24";
     const RELEASE = "0.8.16";
     public $page;           // current page
     public $content;        // content files
@@ -175,12 +175,15 @@ class YellowCore {
             $locationError = $this->content->getHomeLocation($this->page->location).$this->system->get("coreContentSharedDirectory");
             $fileNameError = $this->lookup->findFileFromLocation($locationError, true).$this->system->get("coreContentErrorFile");
             $fileNameError = str_replace("(.*)", $statusCode, $fileNameError);
+            $languageError = $this->lookup->findLanguageFromFile($fileName, $this->system->get("language"));
             if (is_file($fileNameError)) {
                 $rawData = $this->toolbox->readFile($fileNameError);
+            } elseif ($this->language->isExisting($languageError)) {
+                $rawData = "---\nTitle: ".$this->language->getText("coreError${statusCode}Title", $languageError)."\n";
+                $rawData .= "Layout: error\n---\n".$this->language->getText("coreError${statusCode}Text", $languageError);
             } else {
-                $language = $this->lookup->findLanguageFromFile($fileName, $this->system->get("language"));
-                $rawData = "---\nTitle: ".$this->language->getText("coreError${statusCode}Title", $language)."\n";
-                $rawData .= "Layout: error\n---\n".$this->language->getText("coreError${statusCode}Text", $language);
+                $rawData = "---\nTitle:".$this->toolbox->getHttpStatusFormatted($statusCode, true)."\n";
+                $rawData .= "Layout:error\n---\n[yellow error]";
             }
             $cacheable = false;
         } else {
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -21,11 +21,11 @@ Tag: feature
 system/extensions/command.php: command.php, create, update
 
 Extension: Core
-Version: 0.8.23
+Version: 0.8.24
 Description: Core functionality of the website.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/core
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/core.zip
-Published: 2020-10-19 11:14:56
+Published: 2020-10-21 15:43:06
 Developer: Datenstrom
 Tag: feature
 system/extensions/core.php: core.php, create, update