From 52751cb51a78c9c6cf88fdd7a9f556588549d024 Mon Sep 17 00:00:00 2001
From: Ingolf Steinhardt <info@e-spin.de>
Date: Thu, 7 Feb 2019 21:44:57 +0100
Subject: [PATCH] Hotfix SubDcaWidget

---
 .../Hooks/AbstractContentElementAndModuleCallback.php     | 8 ++++----
 src/Widgets/SubDcaWidget.php                              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php b/src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php
index e2bcc5a61..ed1cb7635 100644
--- a/src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php
+++ b/src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php
@@ -365,11 +365,11 @@ protected function buildFilterParamsFor(\DC_Table $dataContainer, $elementName)
      *
      * @param string|null $value The value to save.
      *
-     * @return string
+     * @return string|null
      */
     public function saveCallback(string $value = null)
     {
-        return \base64_decode($value);
+        return null === $value ? null : \base64_decode($value);
     }
 
     /**
@@ -377,11 +377,11 @@ public function saveCallback(string $value = null)
      *
      * @param string|null $value The value.
      *
-     * @return string
+     * @return string|null
      */
     public function loadCallback(string $value = null)
     {
-        return trim(\base64_encode($value), '=');
+        return null === $value ? null : trim(\base64_encode($value), '=');
     }
 
     /**
diff --git a/src/Widgets/SubDcaWidget.php b/src/Widgets/SubDcaWidget.php
index 2412bb06d..29d2b1a03 100644
--- a/src/Widgets/SubDcaWidget.php
+++ b/src/Widgets/SubDcaWidget.php
@@ -16,6 +16,7 @@
  * @author     Danilo Benevides <danilobenevides01@gmail.com>
  * @author     Sven Baumann <baumann.sv@gmail.com>
  * @author     Cliff Parnitzky <github@cliff-parnitzky.de>
+ * @author     Ingolf Steinhardt <info@e-spin.de>
  * @copyright  2012-2019 The MetaModels team.
  * @license    https://github.com/MetaModels/core/blob/master/LICENSE LGPL-3.0-or-later
  * @filesource
@@ -566,8 +567,7 @@ public function generate()
         $strBody = sprintf('<tbody><tr>%s</tr></tbody>', implode("</tr>\n<tr>", $arrOptions));
 
         $strOutput = sprintf(
-            '<table cellspacing="0"%s cellpadding="0" id="ctrl_%s" class="tl_modulewizard multicolumnwizard" ' .
-            'summary="MultiColumnWizard">%s%s</table>',
+            '<table cellspacing="0"%s cellpadding="0" id="ctrl_%s" class="tl_subdca">%s%s</table>',
             (($this->style) ? ('style="' . $this->style . '"') : ('')),
             $this->strId,
             $strHead,