Merge remote-tracking branch 'origin/main' into main

oveleon · Aug 23, 2023 · 9d481d7 · 9d481d7
2 parents b046e3f + d795aae
commit 9d481d7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Compiler/FileCompiler.php b/src/Compiler/FileCompiler.php
@@ -83,6 +83,11 @@ class FileCompiler
      */
     protected string $rootDir;
 
+    /**
+     * Custom skin files
+     */
+    public array $customSkinFiles = [];
+
     /**
      * FileCompiler constructor.
      */
@@ -181,9 +186,9 @@ public function compileConfigFiles(): void
     public function compileSkinFiles(): void
     {
         $arrContent = [];
-        $skinFiles  = StringUtil::deserialize($this->objTheme->skinSourceFiles);
+        $skinFiles = array_merge($this->customSkinFiles, StringUtil::deserialize($this->objTheme->skinSourceFiles, true));
 
-        if (null !== $skinFiles)
+        if (!empty($skinFiles))
         {
             // reverse loading order so following skin files will override configurations from previous ones
             $skinFiles = array_reverse($skinFiles);
@@ -199,7 +204,7 @@ public function compileSkinFiles(): void
                     continue;
                 }
 
-                $this->msg('Compile file: ' . $file->path . '/' . $file->name);
+                $this->msg('Compile file: ' . $file->path);
 
                 $filename = StringUtil::standardize(basename($file->name, $file->extension));
                 $content  = $this->getFileContent($file->path);