mikuli.cz

commit 1dc231ca616dba78166e805fdd85e7637678ef92
parent d6cf268cce4b3a9d62f0918855f7c83c905e52db
Author: markseu <mark2011@mayberg.se>
Date:   Thu,  6 Mar 2025 11:22:38 +0100

Updated static generator, active location

Diffstat:
M
system/extensions/update-available.ini
 | 
8
++++----
M
system/extensions/yellow-extension.ini
 | 
8
++++----
M
system/workers/core.php
 | 
6
++----
M
system/workers/generate.php
 | 
3
+--

4 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/system/extensions/update-available.ini b/system/extensions/update-available.ini
@@ -149,14 +149,14 @@ system/themes/copenhagen.css: copenhagen.css, create, update, careful
 system/themes/copenhagen.png: copenhagen.png, create
 
 Extension: Core
-Version: 0.9.14
+Version: 0.9.15
 Description: Core functionality of your website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-core/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-core
 DocumentationLanguage: en, de, sv
-Published: 2025-01-17 11:06:48
+Published: 2025-03-06 11:17:10
 Status: available
 system/workers/core.php: core.php, create, update
 system/extensions/core.php: corepatch.txt, update
@@ -305,14 +305,14 @@ system/workers/gallery-default-skin.svg: gallery-default-skin.svg, create, updat
 system/workers/gallery-preloader.gif: gallery-preloader.gif, create, update
 
 Extension: Generate
-Version: 0.9.6
+Version: 0.9.7
 Description: Generate a static website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-generate/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-generate
 DocumentationLanguage: en, de, sv
-Published: 2024-05-09 16:39:21
+Published: 2025-03-06 11:09:43
 Status: available
 system/workers/generate.php: generate.php, create, update
 
diff --git a/system/extensions/yellow-extension.ini b/system/extensions/yellow-extension.ini
@@ -1,14 +1,14 @@
 # Datenstrom Yellow extension settings
 
 Extension: Core
-Version: 0.9.14
+Version: 0.9.15
 Description: Core functionality of your website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-core/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-core
 DocumentationLanguage: en, de, sv
-Published: 2025-01-17 11:06:48
+Published: 2025-03-06 11:17:10
 Status: available
 system/workers/core.php: core.php, create, update
 system/extensions/core.php: corepatch.txt, update
@@ -36,14 +36,14 @@ system/workers/edit-stack.svg: edit-stack.svg, create, update
 content/shared/page-new-default.md: page-new-default.md, create, optional
 
 Extension: Generate
-Version: 0.9.6
+Version: 0.9.7
 Description: Generate a static website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-generate/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-generate
 DocumentationLanguage: en, de, sv
-Published: 2024-05-09 16:39:21
+Published: 2025-03-06 11:09:43
 Status: available
 system/workers/generate.php: generate.php, create, update
 
diff --git a/system/workers/core.php b/system/workers/core.php
@@ -2,7 +2,7 @@
 // Core extension, https://github.com/annaesvensson/yellow-core
 
 class YellowCore {
-    const VERSION = "0.9.14";
+    const VERSION = "0.9.15";
     const RELEASE = "0.9";
     public $content;        // content files
     public $media;          // media files
@@ -3023,7 +3023,6 @@ class YellowPage {
     public $lastModified;           // last modification date
     public $available;              // page is available? (boolean)
     public $visible;                // page is visible location? (boolean)
-    public $active;                 // page is active location? (boolean)
     public $cacheable;              // page is cacheable? (boolean)
 
     public function __construct($yellow) {
@@ -3059,7 +3058,6 @@ class YellowPage {
         $this->lastModified = 0;
         $this->available = true;
         $this->visible = true;
-        $this->active = $this->yellow->lookup->isActiveLocation($this->location, $this->yellow->page->location);
         $this->parseMetaData();
     }
     
@@ -3546,7 +3544,7 @@ class YellowPage {
 
     // Check if page is within current HTTP request
     public function isActive() {
-        return $this->active;
+        return $this->yellow->lookup->isActiveLocation($this->location, $this->yellow->page->location);
     }
     
     // Check if page is cacheable
diff --git a/system/workers/generate.php b/system/workers/generate.php
@@ -2,7 +2,7 @@
 // Generate extension, https://github.com/annaesvensson/yellow-generate
 
 class YellowGenerate {
-    const VERSION = "0.9.6";
+    const VERSION = "0.9.7";
     public $yellow;                  // access to API
     public $files;                   // number of files
     public $errors;                  // number of errors
@@ -136,7 +136,6 @@ class YellowGenerate {
 
     // Generate static file
     public function generateStaticFile($path, $location, $analyse = false, $probe = false, $error = false) {
-        $this->yellow->content->pages = array();
         $this->yellow->page = new YellowPage($this->yellow);
         $this->yellow->page->fileName = substru($location, 1);
         if (!is_readable($this->yellow->page->fileName)) {