mikuli.cz

commit c4bde2a692a45d6df00de0cf55e42f9c7abf08f2
parent beee937102b95878de8d8b1fb6838504888f53dd
Author: markseu <mark2011@mayberg.se>
Date:   Wed, 10 Apr 2024 12:05:02 +0200

Updated installer

Diffstat:
M
system/extensions/update-available.ini
 | 
6
+++---
M
system/extensions/yellow-extension.ini
 | 
4
++--
M
system/workers/install.php
 | 
9
+++++++--

3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/system/extensions/update-available.ini b/system/extensions/update-available.ini
@@ -353,16 +353,16 @@ Status: available
 system/workers/googlemap.php: googlemap.php, create, update
 
 Extension: Help
-Version: 0.9.2
+Version: 0.9.3
 Description: Help for your website.
 Developer: Anna Svensson
 Tag: feature
 DownloadUrl: https://github.com/annaesvensson/yellow-help/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-help
 DocumentationLanguage: en, de, sv
-Published: 2024-04-09 21:40:35
+Published: 2024-04-10 11:57:45
 Status: available
-system/extensions/help.php: help.php, create, update
+system/workers/help.php: help.php, create, update
 content/9-help/api-for-developers.md: api-for-developers.md, create, optional, multi-language
 content/9-help/contributing-guidelines.md: contributing-guidelines.md, create, optional, multi-language
 content/9-help/how-to-change-the-content.md: how-to-change-the-content.md, create, optional, multi-language
diff --git a/system/extensions/yellow-extension.ini b/system/extensions/yellow-extension.ini
@@ -62,13 +62,13 @@ media/images/photo.jpg: photo.jpg, create, optional
 media/thumbnails/photo-100x40.jpg: photo-100x40.jpg, create, optional
 
 Extension: Install
-Version: 0.9.2
+Version: 0.9.3
 Description: Install a brand new website.
 Developer: Anna Svensson
 DownloadUrl: https://github.com/annaesvensson/yellow-install/archive/refs/heads/main.zip
 DocumentationUrl: https://github.com/annaesvensson/yellow-install
 DocumentationLanguage: en, de, sv
-Published: 2024-04-10 10:27:08
+Published: 2024-04-10 11:38:35
 Status: unassembled
 system/workers/install.php: install.php, create
 system/workers/install-language.bin: install-language.bin, compress @source/yellow-language/, create
diff --git a/system/workers/install.php b/system/workers/install.php
@@ -2,7 +2,7 @@
 // Install extension, https://github.com/annaesvensson/yellow-install
 
 class YellowInstall {
-    const VERSION = "0.9.2";
+    const VERSION = "0.9.3";
     const PRIORITY = "1";
     public $yellow;                 // access to API
     
@@ -526,7 +526,12 @@ class YellowInstall {
         if ($this->yellow->system->get("generateStaticUrl")=="auto" && getenv("URL")!==false) $settings["generateStaticUrl"] = getenv("URL");
         if ($this->yellow->system->get("generateStaticUrl")=="auto" && $skipInstallation) $settings["generateStaticUrl"] = "http://localhost:8000/";
         if ($this->yellow->system->get("coreTimezone")=="UTC") $settings["coreTimezone"] = $this->yellow->toolbox->detectServerTimezone();
-        if ($this->yellow->system->get("updateEventPending")=="none") $settings["updateEventPending"] = "website/install";
+        if ($this->yellow->system->get("updateEventPending")=="none") {
+            $settings["updateEventPending"] = "website/install";
+        } else {
+            $themeStandard = ",".$this->yellow->system->get("theme")."/install";
+            $settings["updateEventPending"] = $this->yellow->system->get("updateEventPending").$themeStandard;
+        }
         $settings["updateCurrentRelease"] = YellowCore::RELEASE;
         return $settings;
     }