mikuli.cz

commit a7644caba11c0935eabbc772b57611ca3cdb36e0
parent 14986ec389e7bd4a00e5568c97f00b37b726e742
Author: markseu <mark2011@mayberg.se>
Date:   Mon, 29 Nov 2021 17:24:10 +0100

Updated tool chain for system testing

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

2 files changed, 9 insertions(+), 4 deletions(-)
diff --git 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.61
+Version: 0.8.62
 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-29 15:34:22
+Published: 2021-11-29 17:22:46
 Developer: Datenstrom
 Tag: feature
 system/extensions/update.php: update.php, create, update
diff --git 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.61";
+    const VERSION = "0.8.62";
     const PRIORITY = "2";
     public $yellow;                 // access to API
     public $updates;                // number of updates
@@ -321,7 +321,12 @@ class YellowUpdate {
                     foreach ($this->getExtensionFileNames($settings) as $fileName) {
                         list($entry, $flags) = $this->yellow->toolbox->getTextList($settings[$fileName], ",", 2);
                         if (!$this->yellow->lookup->isContentFile($fileName)) {
-                            $fileData = $zip->getFromName($pathBase.$entry);
+                            if (preg_match("/^@base/i", $entry)) {
+                                $fileNameSource = preg_replace("/@base/i", rtrim($pathBase, "/"), $entry);
+                            } else {
+                                $fileNameSource = $pathBase.$entry;
+                            }
+                            $fileData = $zip->getFromName($fileNameSource);
                             $lastModified = $this->yellow->toolbox->getFileModified($fileName);
                             $statusCode = $this->updateExtensionFile($fileName, $fileData,
                                 $newModified, $oldModified, $lastModified, $flags, $extension);