Some fixes for merge repeat formatting in lists

components/com_fabrik/helpers/html.php

@@ -2292,11 +2292,13 @@ public static function canvasSupport()
 	public static function runContentPlugins(&$text)
 	{
 		$app   = JFactory::getApplication();
-		$input = $app->input;
-		$opt   = $input->get('option');
-		$view  = $input->get('view');
+		$input  = $app->input;
+		$opt    = $input->get('option');
+		$view   = $input->get('view');
+		$format = $input->get('format');
 		$input->set('option', 'com_content');
 		$input->set('view', 'article');
+		$input->set('format', 'html');
 		jimport('joomla.html.html.content');
 
 		/**
@@ -2322,6 +2324,7 @@ public static function runContentPlugins(&$text)
 
 		$input->set('option', $opt);
 		$input->set('view', $view);
+		$input->set('format', $format);
 	}
 
 	/**

components/com_fabrik/models/element.php

@@ -5951,6 +5951,11 @@ public function renderListData($data, stdClass &$thisRow, $opts = array())
 
 		foreach ($data as $i => &$d)
 		{
+			if (empty($d))
+			{
+				$d = ' ';
+			}
+
 			if ($params->get('icon_folder') == '1' && ArrayHelper::getValue($opts, 'icon', 1))
 			{
 				// $$$ rob was returning here but that stopped us being able to use links and icons together

components/com_fabrik/models/elementlist.php

@@ -655,6 +655,10 @@ public function renderListData($data, stdClass &$thisRow, $opts = array())
 				{
 					$lis[] = $l;
 				}
+				else
+				{
+					$lis[] = ' ';
+				}
 			}
 
 			if (!empty($lis))

plugins/fabrik_element/date/date.php

@@ -70,7 +70,7 @@ public function renderListData($data, stdClass &$thisRow, $opts = array())
 	{
 		if ($data == '')
 		{
-			return '';
+			return parent::renderListData($data, $thisRow, $opts);
 		}
 
 		// @TODO: deal with time options (currently can be defined in date_table_format param).