Correctly fix contao/core-bundle#1438

contao · Sep 7, 2019 · 1e02bb0 · 1e02bb0
1 parent 28e4051
commit 1e02bb0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/core-bundle/src/Resources/contao/dca/tl_content.php b/core-bundle/src/Resources/contao/dca/tl_content.php
@@ -552,7 +552,7 @@
 			'exclude'                 => true,
 			'inputType'               => 'select',
 			'options_callback'        => array('tl_content', 'getGalleryTemplates'),
-			'eval'                    => array('tl_class'=>'w50'),
+			'eval'                    => array('includeBlankOption'=>true, 'chosen'=>true, 'tl_class'=>'w50'),
 			'sql'                     => "varchar(64) NOT NULL default ''"
 		),
 		'customTpl' => array

diff --git a/core-bundle/src/Resources/contao/dca/tl_module.php b/core-bundle/src/Resources/contao/dca/tl_module.php
@@ -224,7 +224,7 @@
 			'exclude'                 => true,
 			'inputType'               => 'select',
 			'options_callback'        => array('tl_module', 'getNavigationTemplates'),
-			'eval'                    => array('tl_class'=>'w50'),
+			'eval'                    => array('includeBlankOption'=>true, 'chosen'=>true, 'tl_class'=>'w50'),
 			'sql'                     => "varchar(64) NOT NULL default ''"
 		),
 		'customTpl' => array
@@ -301,7 +301,7 @@
 			'exclude'                 => true,
 			'inputType'               => 'select',
 			'options_callback'        => array('tl_module', 'getMemberTemplates'),
-			'eval'                    => array('tl_class'=>'w50'),
+			'eval'                    => array('includeBlankOption'=>true, 'chosen'=>true, 'tl_class'=>'w50'),
 			'sql'                     => "varchar(64) NOT NULL default ''"
 		),
 		'form' => array
@@ -365,7 +365,7 @@
 			'exclude'                 => true,
 			'inputType'               => 'select',
 			'options_callback'        => array('tl_module', 'getSearchTemplates'),
-			'eval'                    => array('tl_class'=>'w50'),
+			'eval'                    => array('includeBlankOption'=>true, 'chosen'=>true, 'tl_class'=>'w50'),
 			'sql'                     => "varchar(64) NOT NULL default ''"
 		),
 		'inColumn' => array

diff --git a/core-bundle/src/Resources/contao/elements/ContentGallery.php b/core-bundle/src/Resources/contao/elements/ContentGallery.php
@@ -316,15 +316,13 @@ protected function compile()
 			++$rowcount;
 		}
 
-		$strTemplate = 'gallery_default';
-
-		// Use a custom template
-		if (TL_MODE == 'FE' && $this->galleryTpl != '')
+		// Set the default template
+		if ($this->galleryTpl == '')
 		{
-			$strTemplate = $this->galleryTpl;
+			$this->galleryTpl = 'gallery_default';
 		}
 
-		$objTemplate = new FrontendTemplate($strTemplate);
+		$objTemplate = new FrontendTemplate($this->galleryTpl);
 		$objTemplate->setData($this->arrData);
 		$objTemplate->body = $body;
 		$objTemplate->headline = $this->headline; // see #1603

diff --git a/core-bundle/src/Resources/contao/modules/Module.php b/core-bundle/src/Resources/contao/modules/Module.php
@@ -141,7 +141,7 @@ public function __construct($objModule, $strColumn='main')
 		$this->arrData = $objModule->row();
 		$this->cssID = StringUtil::deserialize($objModule->cssID, true);
 
-		if ($this->customTpl != '' && TL_MODE == 'FE')
+		if ($this->customTpl != '')
 		{
 			$this->strTemplate = $this->customTpl;
 		}

diff --git a/core-bundle/src/Resources/contao/modules/ModuleSearch.php b/core-bundle/src/Resources/contao/modules/ModuleSearch.php
@@ -263,6 +263,12 @@ protected function compile()
 
 			list($contextLength, $totalLength) = StringUtil::deserialize($this->contextLength);
 
+			// Set the default template
+			if ($this->searchTpl == '')
+			{
+				$this->searchTpl = 'search_default';
+			}
+
 			// Get the results
 			for ($i=($from-1); $i<$to && $i<$count; $i++)
 			{