Merge pull request #38 from werph/3.x

fix parsing basic entities in contao ^5.0
markocupic · Oct 16, 2024 · 269b04a · 269b04a
2 parents c2ba66a + 0251c9c
commit 269b04a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/contao/dca/tl_gallery_creator_albums.php b/contao/dca/tl_gallery_creator_albums.php
@@ -147,7 +147,7 @@
             'filter'    => true,
             'search'    => true,
             'sorting'   => true,
-            'eval'      => ['mandatory' => true, 'tl_class' => 'w50', 'submitOnChange' => false],
+            'eval'      => ['mandatory' => true, 'tl_class' => 'w50', 'submitOnChange' => false, 'basicEntities' => true],
             'inputType' => 'text',
             'sql'       => "varchar(255) NOT NULL default ''",
         ],
@@ -178,7 +178,7 @@
             'exclude'   => true,
             'search'    => true,
             'inputType' => 'textarea',
-            'eval'      => ['decodeEntities' => true, 'tl_class' => 'w33'],
+            'eval'      => ['decodeEntities' => true, 'tl_class' => 'w33', 'basicEntities' => true],
             'sql'       => 'text NULL',
         ],
         'date'              => [
@@ -218,7 +218,7 @@
             'exclude'   => true,
             'search'    => true,
             'inputType' => 'textarea',
-            'eval'      => ['style' => 'height:60px', 'tl_class' => 'clr long', 'allowHtml' => false, 'wrap' => 'soft'],
+            'eval'      => ['style' => 'height:60px', 'tl_class' => 'clr long', 'allowHtml' => false, 'wrap' => 'soft', 'basicEntities' => true],
             'sql'       => 'text NULL',
         ],
         'captionType'       => [
@@ -230,7 +230,7 @@
         ],
         'caption'           => [
             'cols'      => 20,
-            'eval'      => ['style' => 'height:60px', 'decodeEntities' => true, 'tl_class' => 'clr long', 'allowHtml' => false, 'wrap' => 'soft'],
+            'eval'      => ['style' => 'height:60px', 'decodeEntities' => true, 'tl_class' => 'clr long', 'allowHtml' => false, 'wrap' => 'soft', 'basicEntities' => true],
             'exclude'   => true,
             'inputType' => 'textarea',
             'rows'      => 5,

diff --git a/contao/dca/tl_gallery_creator_pictures.php b/contao/dca/tl_gallery_creator_pictures.php
@@ -125,15 +125,15 @@
             'eval' => ['tl_class' => 'w50'],
         ],
         'title'          => [
-            'eval'      => ['allowHtml' => false, 'decodeEntities' => true, 'rgxp' => 'alnum', 'tl_class' => 'w50'],
+            'eval'      => ['allowHtml' => false, 'decodeEntities' => true, 'rgxp' => 'alnum', 'tl_class' => 'w50', 'basicEntities' => true],
             'exclude'   => true,
             'search'    => true,
             'inputType' => 'text',
             'sql'       => "varchar(255) NOT NULL default ''",
         ],
         'caption'        => [
             'cols'      => 20,
-            'eval'      => ['style' => 'height:60px', 'decodeEntities' => true, 'tl_class' => 'w50', 'allowHtml' => false, 'wrap' => 'soft'],
+            'eval'      => ['style' => 'height:60px', 'decodeEntities' => true, 'tl_class' => 'w50', 'allowHtml' => false, 'wrap' => 'soft', 'basicEntities' => true],
             'exclude'   => true,
             'inputType' => 'textarea',
             'rows'      => 5,