From 63cf2d4dafc46f09164d228fbdcd41460111ae89 Mon Sep 17 00:00:00 2001
From: markseu <mark2011@mayberg.se>
Date: Thu, 18 Nov 2021 22:15:09 +0100
Subject: [PATCH] Update blog/wiki layout handling

---
 system/extensions/install-wiki.zip   | Bin 4731 -> 4721 bytes
 system/extensions/update-current.ini |   4 ++--
 system/extensions/update.php         |  13 +++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/system/extensions/install-wiki.zip b/system/extensions/install-wiki.zip
index 1c758ee8f7d11ca535d2f3dcf7ab4eac5f79a434..d31a3b5467d87883d5816e1a59a72a1c55503565 100644
GIT binary patch
delta 2870
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
U0Raj*%667u4v_~J3GVm(8#8`L!~g&Q

delta 2770
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
UR9FA0wpd+)0gnVTk?S=1H-F<H<NyEw

diff --git a/system/extensions/update-current.ini b/system/extensions/update-current.ini
index 4dc037e..0203263 100755
--- a/system/extensions/update-current.ini
+++ b/system/extensions/update-current.ini
@@ -129,11 +129,11 @@ system/themes/stockholm-opensans-light.woff: stockholm-opensans-light.woff, crea
 system/themes/stockholm-opensans-regular.woff: stockholm-opensans-regular.woff, create, update, careful
 
 Extension: Update
-Version: 0.8.57
+Version: 0.8.58
 Description: Keep your website up to date.
 HelpUrl: https://github.com/datenstrom/yellow-extensions/tree/master/source/update
 DownloadUrl: https://github.com/datenstrom/yellow-extensions/raw/master/zip/update.zip
-Published: 2021-11-18 19:47:05
+Published: 2021-11-18 22:03:08
 Developer: Datenstrom
 Tag: feature
 system/extensions/update.php: update.php, create, update
diff --git a/system/extensions/update.php b/system/extensions/update.php
index 993c792..ce3fced 100644
--- a/system/extensions/update.php
+++ b/system/extensions/update.php
@@ -2,7 +2,7 @@
 // Update extension, https://github.com/datenstrom/yellow-extensions/tree/master/source/update
 
 class YellowUpdate {
-    const VERSION = "0.8.57";
+    const VERSION = "0.8.58";
     const PRIORITY = "2";
     public $yellow;                 // access to API
     public $updates;                // number of updates
@@ -69,7 +69,7 @@ class YellowUpdate {
                 }
             }
         }
-        if ($action=="update") { // TODO: remove later, convert old content files
+        if ($action=="update") { // TODO: remove later, convert old content/layout files
             if ($this->yellow->system->isExisting("blogLocation") || $this->yellow->system->isExisting("wikiLocation")) {
                 $path = $this->yellow->system->get("coreContentDirectory");
                 foreach ($this->yellow->toolbox->getDirectoryEntriesRecursive($path, "/^.*\.md$/", true, false) as $entry) {
@@ -82,6 +82,15 @@ class YellowUpdate {
                         $this->yellow->log("error", "Can't write file '$entry'!");
                     }
                 }
+                $path = $this->yellow->system->get("coreLayoutDirectory");
+                foreach ($this->yellow->toolbox->getDirectoryEntriesRecursive($path, "/^.*\.html$/", true, false) as $entry) {
+                    $fileData = $fileDataNew = $this->yellow->toolbox->readFile($entry);
+                    $fileDataNew = str_replace("yellow->page->getPage(\"blog\")", "yellow->page->getPage(\"blogStart\")", $fileDataNew);
+                    $fileDataNew = str_replace("yellow->page->getPage(\"wiki\")", "yellow->page->getPage(\"wikiStart\")", $fileDataNew);
+                    if ($fileData!=$fileDataNew && !$this->yellow->toolbox->createFile($entry, $fileDataNew)) {
+                        $this->yellow->log("error", "Can't write file '$entry'!");
+                    }
+                }
             }
         }
         if ($action=="update") { // TODO: remove later, convert old extension settings