Fix multicolumn wizard type parameter

Author: LBeckX

src/EventListener/Loader2/Loader2JS.php

@@ -62,24 +62,20 @@ public function generateTemplateFiles(PageModel $page, LayoutModel $layout, Page
     }
 
     /**
-     * @param string $savedFiles
+     * @param string|null $savedFiles
      * @param DataContainer $dataContainer
      * @return string
      * @throws \Exception
      */
-    public function getMultiColumnWizardFiles(string $savedFiles, DataContainer $dataContainer): string
+    public function getMultiColumnWizardFiles(?string $savedFiles, DataContainer $dataContainer): string
     {
-        $savedFiles = array_reverse($savedFiles ? unserialize($savedFiles) : []);
+        $savedFiles = $savedFiles ? array_reverse(unserialize($savedFiles)) : [];
 
         $files = $this->_loadFilesByFillTree($dataContainer);
 
         $returnArray = [];
 
         foreach ($savedFiles as $savedFile) {
-            /*if ($savedFile['js_files_extFile'] === "1") {
-                array_unshift($returnArray, $savedFile);
-                continue;
-            }*/
 
             foreach ($files as $pathLoadedKey => $pathLoadedFile) {
                 if (str_replace(TL_ROOT, "", $pathLoadedFile) === $savedFile['js_files_path']) {

src/EventListener/Loader2/Loader2Style.php

@@ -59,22 +59,24 @@ public function generateTemplateFiles(PageModel $page, LayoutModel $layout, Page
     }
 
     /**
-     * @param string $savedFiles
+     * @param string|null $savedFiles
      * @param DataContainer $dataContainer
      * @return string
      * @throws \Exception
      */
-    public function getMultiColumnWizardFiles(string $savedFiles, DataContainer $dataContainer): string
+    public function getMultiColumnWizardFiles(?string $savedFiles, DataContainer $dataContainer): string
     {
         if (TL_MODE == 'BE') {
             $GLOBALS['TL_JAVASCRIPT'][] = 'bundles/filelazyloader/js/lazy-style-loader.js|static';
         }
 
         $files = $this->_loadFilesByFillTree($dataContainer);
 
+        $savedFiles = $savedFiles ? unserialize($savedFiles) : [];
+
         $wizardFiles = [];
 
-        foreach (unserialize($savedFiles) as $savedFile) {
+        foreach ($savedFiles as $savedFile) {
             if (!is_numeric($key = array_search($savedFile['style_files_path'], $files))) {
                 continue;
             }