Don't bother with lightbox links for images in RSS feeds

Fabrik · Sep 19, 2016 · 9ce6fc7 · 9ce6fc7
1 parent 9b6f796
commit 9ce6fc7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/components/com_fabrik/views/list/view.fabrikfeed.php b/components/com_fabrik/views/list/view.fabrikfeed.php
@@ -215,6 +215,7 @@ public function display($tpl = null)
 							}
 							else
 							{
+								$enclosureUrl = ltrim($enclosureUrl, '/\\');
 								$enclosureFile = COM_FABRIK_BASE . $enclosureUrl;
 								$enclosureUrl = COM_FABRIK_LIVESITE . str_replace('\\', '/', $enclosureUrl);
 							}

diff --git a/plugins/fabrik_element/fileupload/models/image.php b/plugins/fabrik_element/fileupload/models/image.php
@@ -70,6 +70,7 @@ public function render(&$model, &$params, $file, $thisRow = null)
 		 * So we have to work out if we're being called from a table or form
 		 */
 		$formModel = $model->getFormModel();
+		$listModel = $model->getListModel();
 		$title     = basename($file);
 
 		if ($params->get('fu_title_element') == '')
@@ -134,7 +135,9 @@ public function render(&$model, &$params, $file, $thisRow = null)
 		$displayData->lightboxAttrs = FabrikHelperHTML::getLightboxAttributes($title, $n);
 		$displayData->fullSize      = $model->storage->preRenderPath($fullSize);
 		$displayData->file          = $file;
-		$displayData->makeLink      = $params->get('make_link', true) && !$this->fullImageInRecord($params);
+		$displayData->makeLink      = $params->get('make_link', true)
+			&& !$this->fullImageInRecord($params)
+			&& $listModel->getOutPutFormat() !== 'feed';
 		$displayData->title         = $title;
 		$displayData->isJoin        = $model->isJoin();
 		$displayData->width         = $width;