Hotfix SubDcaWidget

Author: zonky2

src/CoreBundle/Contao/Hooks/AbstractContentElementAndModuleCallback.php

@@ -315,7 +315,7 @@ public function getMetaDescriptionAttributes(\DC_Table $objDC)
      * @param \DC_Table $dataContainer The data container calling this method.
      * @param string    $elementName   The type name to search for.
      *
-     * @return void
+     * @return @return string|null
      *
      * @SuppressWarnings(PHPMD.Superglobals)
      * @SuppressWarnings(PHPMD.CamelCaseVariableName)
@@ -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);
     }
 
     /**
@@ -381,7 +381,7 @@ public function saveCallback(string $value = null)
      */
     public function loadCallback(string $value = null)
     {
-        return trim(\base64_encode($value), '=');
+        return null === $value ? null : trim(\base64_encode($value), '=');
     }
 
     /**

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,