Fix template preview

joomla · Dec 9, 2021 · 2ef95e4 · 2ef95e4
1 parent ed1a749
commit 2ef95e4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/libraries/src/Document/Renderer/Html/ModulesRenderer.php b/libraries/src/Document/Renderer/Html/ModulesRenderer.php
@@ -10,7 +10,6 @@
 
 \defined('JPATH_PLATFORM') or die;
 
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Document\DocumentRenderer;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ModuleHelper;
@@ -43,26 +42,8 @@ public function render($position, $params = array(), $content = null)
 		$user         = Factory::getUser();
 		$frontediting = ($app->isClient('site') && $app->get('frontediting', 1) && !$user->guest);
 		$menusEditing = ($app->get('frontediting', 1) == 2) && $user->authorise('core.edit', 'com_menus');
-		$modules      = ModuleHelper::getModules($position);
 
-		// Prepend a dummy module for template preview
-		if ($app->input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display'))
-		{
-			$dummy = (object) [
-				'id' => 0,
-				'module' => '',
-				'params' => '',
-				'showtitle' => 0,
-				'title' => $position,
-				'position' => $position,
-				'content' => $position,
-				'contentRendered' => true,
-			];
-
-			array_unshift($modules, $dummy);
-		}
-
-		foreach ($modules as $mod)
+		foreach (ModuleHelper::getModules($position) as $mod)
 		{
 			$moduleHtml = $renderer->render($mod, $params, $content);
 

diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
@@ -85,6 +85,7 @@ public static function &getModules($position)
 	{
 		$position = strtolower($position);
 		$result   = array();
+		$input    = Factory::getApplication()->input;
 		$modules  = &static::load();
 		$total    = \count($modules);
 
@@ -96,6 +97,18 @@ public static function &getModules($position)
 			}
 		}
 
+		// Prepend a dummy module for template preview
+		if ($input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display'))
+		{
+			$dummy = static::createDummyModule();
+			$dummy->title = $position;
+			$dummy->position = $position;
+			$dummy->content = $position;
+			$dummy->contentRendered = true;
+
+			array_unshift($result, $dummy);
+		}
+
 		return $result;
 	}