Handle style-preload.json in Style(Add|Edit)Form and StyleGlobalValuesForm

This file is not yet created when testing the style.

diff --git a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
index a02e30ddda84580ae8bbe5b8852c06eae6aa102d..bcceac10e127cf5a80d5e6501d9674e3300b0499 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleAddForm.class.php
@@ -926,9 +926,16 @@ class StyleAddForm extends AbstractForm
         ]);
 
         // Do not save the compiled style, because the image path was unknown during the style generation.
-        if ($this->styleTestFileDir && \file_exists($this->styleTestFileDir . '/style.css') && \file_exists($this->styleTestFileDir . '/style-rtl.css')) {
-            \unlink($this->styleTestFileDir . '/style.css');
-            \unlink($this->styleTestFileDir . '/style-rtl.css');
+        if ($this->styleTestFileDir) {
+            if (\file_exists($this->styleTestFileDir . '/style.css')) {
+                \unlink($this->styleTestFileDir . '/style.css');
+            }
+            if (\file_exists($this->styleTestFileDir . '/style-rtl.css')) {
+                \unlink($this->styleTestFileDir . '/style-rtl.css');
+            }
+            if (\file_exists($this->styleTestFileDir . '/style-preload.json')) {
+                \unlink($this->styleTestFileDir . '/style-preload.json');
+            }
 
             \rmdir($this->styleTestFileDir);
         }

diff --git a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
index 4b27c17013bc63864d4602b348853e9a51e9d087..33161bb8208f642839edcfacc5562824ffc2d35d 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleEditForm.class.php
@@ -339,6 +339,9 @@ class StyleEditForm extends StyleAddForm
             $styleFilename = StyleCompiler::getFilenameForStyle($this->style);
             \rename($this->styleTestFileDir . '/style.css', $styleFilename . '.css');
             \rename($this->styleTestFileDir . '/style-rtl.css', $styleFilename . '-rtl.css');
+            if (\file_exists($this->styleTestFileDir . '/style-preload.json')) {
+                \rename($this->styleTestFileDir . '/style-preload.json', $styleFilename . '-preload.json');
+            }
 
             \rmdir($this->styleTestFileDir);
         }

diff --git a/wcfsetup/install/files/lib/acp/form/StyleGlobalValuesForm.class.php b/wcfsetup/install/files/lib/acp/form/StyleGlobalValuesForm.class.php
index 310e0785bcc16c9eff2c04dea21f51b3f3035697..4dff54fd0c83a73ab52cd99cb157fb8188cb641f 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/StyleGlobalValuesForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/StyleGlobalValuesForm.class.php
@@ -150,10 +150,18 @@ class StyleGlobalValuesForm extends AbstractForm
 
         // save compiled style
         $defaultStyle = StyleHandler::getInstance()->getDefaultStyle();
-        if ($defaultStyle !== null && $this->styleTestFileDir && \file_exists($this->styleTestFileDir . '/style.css') && \file_exists($this->styleTestFileDir . '/style-rtl.css')) {
+        if (
+            $defaultStyle !== null
+            && $this->styleTestFileDir
+            && \file_exists($this->styleTestFileDir . '/style.css')
+            && \file_exists($this->styleTestFileDir . '/style-rtl.css')
+        ) {
             $styleFilename = StyleCompiler::getFilenameForStyle($defaultStyle);
             \rename($this->styleTestFileDir . '/style.css', $styleFilename . '.css');
             \rename($this->styleTestFileDir . '/style-rtl.css', $styleFilename . '-rtl.css');
+            if (\file_exists($this->styleTestFileDir . '/style-preload.json')) {
+                \rename($this->styleTestFileDir . '/style-preload.json', $styleFilename . '-preload.json');
+            }
 
             \rmdir($this->styleTestFileDir);
         }