Fix template preview

Author: Fedik

libraries/src/Document/Renderer/Html/ModulesRenderer.php

@@ -10,6 +10,7 @@
 
 \defined('JPATH_PLATFORM') or die;
 
+use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Document\DocumentRenderer;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ModuleHelper;
@@ -42,8 +43,26 @@ 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);
 
-		foreach (ModuleHelper::getModules($position) as $mod)
+		// 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)
 		{
 			$moduleHtml = $renderer->render($mod, $params, $content);
 

libraries/src/Helper/ModuleHelper.php

@@ -84,12 +84,9 @@ public static function &getModule($name, $title = null)
 	public static function &getModules($position)
 	{
 		$position = strtolower($position);
-		$result = array();
-		$input  = Factory::getApplication()->input;
-
-		$modules =& static::load();
-
-		$total = \count($modules);
+		$result   = array();
+		$modules  = &static::load();
+		$total    = \count($modules);
 
 		for ($i = 0; $i < $total; $i++)
 		{
@@ -99,16 +96,6 @@ public static function &getModules($position)
 			}
 		}
 
-		if (\count($result) === 0)
-		{
-			if ($input->getBool('tp') && ComponentHelper::getParams('com_templates')->get('template_positions_display'))
-			{
-				$result[0] = static::createDummyModule();
-				$result[0]->title = $position;
-				$result[0]->position = $position;
-			}
-		}
-
 		return $result;
 	}