mikuli.cz

commit 9811e44b27bc85e9965314977d17d68952b06ab5
parent e53f4f42195435900af483caa3aa05264302dd3c
Author: markseu <mark2011@mayberg.se>
Date:   Fri, 30 Sep 2022 20:13:10 +0200

Updated core

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

3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/system/extensions/core.php b/system/extensions/core.php
@@ -2,7 +2,7 @@
 // Core extension, https://github.com/annaesvensson/yellow-core
 
 class YellowCore {
-    const VERSION = "0.8.89";
+    const VERSION = "0.8.90";
     const RELEASE = "0.8.20";
     public $page;           // current page
     public $content;        // content files
@@ -28,9 +28,9 @@ class YellowCore {
         $this->system->setDefault("sitename", "Localhost");
         $this->system->setDefault("author", "Datenstrom");
         $this->system->setDefault("email", "webmaster");
+        $this->system->setDefault("language", "en");
         $this->system->setDefault("layout", "default");
         $this->system->setDefault("theme", "default");
-        $this->system->setDefault("language", "en");
         $this->system->setDefault("parser", "markdown");
         $this->system->setDefault("status", "public");
         $this->system->setDefault("coreServerUrl", "auto");
@@ -203,11 +203,11 @@ class YellowCore {
             foreach ($this->page->headerData as $key=>$value) {
                 echo "YellowCore::sendPage $key: $value<br/>\n";
             }
+            $language = $this->page->get("language");
             $layout = $this->page->get("layout");
             $theme = $this->page->get("theme");
-            $language = $this->page->get("language");
             $parser = $this->page->get("parser");
-            echo "YellowCore::sendPage layout:$layout theme:$theme language:$language parser:$parser<br/>\n";
+            echo "YellowCore::sendPage language:$language layout:$layout theme:$theme parser:$parser<br/>\n";
         }
         return $statusCode;
     }
@@ -1622,6 +1622,10 @@ class YellowSystem {
             foreach ($this->yellow->user->settings as $userKey=>$userValue) {
                 array_push($values, $userKey);
             }
+        } elseif ($key=="language") {
+            foreach ($this->yellow->language->settings as $languageKey=>$languageValue) {
+                array_push($values, $languageKey);
+            }
         } elseif ($key=="layout") {
             $path = $this->yellow->system->get("coreLayoutDirectory");
             foreach ($this->yellow->toolbox->getDirectoryEntries($path, "/^.*\.html$/", true, false, false) as $entry) {
@@ -1632,10 +1636,6 @@ class YellowSystem {
             foreach ($this->yellow->toolbox->getDirectoryEntries($path, "/^.*\.css$/", true, false, false) as $entry) {
                 array_push($values, lcfirst(substru($entry, 0, -4)));
             }
-        } elseif ($key=="language") {
-            foreach ($this->yellow->language->settings as $languageKey=>$languageValue) {
-                array_push($values, $languageKey);
-            }
         }
         return $values;
     }
diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
@@ -11,11 +11,11 @@ Tag: feature
 system/extensions/command.php: command.php, create, update
 
 Extension: Core
-Version: 0.8.89
+Version: 0.8.90
 Description: Core functionality of the website.
 DocumentationUrl: https://github.com/annaesvensson/yellow-core
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/main/downloads/core.zip
-Published: 2022-06-22 21:10:40
+Published: 2022-09-30 19:44:34
 Developer: Datenstrom
 Tag: feature
 system/extensions/core.php: core.php, create, update
diff --git a/system/extensions/yellow-system.ini b/system/extensions/yellow-system.ini
@@ -3,8 +3,8 @@
 Sitename: Datenstrom Yellow
 Author: Datenstrom
 Email: webmaster
+Language: en
 Layout: default
 Theme: stockholm
-Language: en
 Parser: markdown
 Status: public