From 81bdd482bf0a846d66d5fc9117638ce4fa2fe281 Mon Sep 17 00:00:00 2001
From: pollen8 <rob@pollen-8.co.uk>
Date: Fri, 24 Jan 2014 16:44:25 +0100
Subject: [PATCH] fixed: display element in details view was not using its
 "show label" option

---
 components/com_fabrik/models/element.php   | 13 ++++++++++++-
 plugins/fabrik_element/display/display.php | 16 ++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/components/com_fabrik/models/element.php b/components/com_fabrik/models/element.php
index c73af9b6057..238eba17078 100644
--- a/components/com_fabrik/models/element.php
+++ b/components/com_fabrik/models/element.php
@@ -2032,6 +2032,17 @@ public function copyRow($id, $copytxt = 'Copy of %s', $groupid = null, $name = n
 		return $rule;
 	}
 
+	/**
+	 * Get the element's raw label (used for details view, not wrapped in <label> tags
+	 *
+	 * @return  string  Label
+	 */
+
+	protected function getRawLabel()
+	{
+		return $this->element->label;
+	}
+
 	/**
 	 * This was in the views display and _getElement code but seeing as its used
 	 * by multiple views its safer to have it here
@@ -2095,7 +2106,7 @@ public function preRender($c, $elCount, $tmpl)
 		// Ensure that view data property contains the same html as the group's element
 
 		$model->tmplData[$elHTMLName] = $element->element;
-		$element->label_raw = $this->element->label;
+		$element->label_raw = $this->getRawLabel();
 
 		// GetLabel needs to know if the element is editable
 		if ($elementTable->name != $this->_foreignKey)
diff --git a/plugins/fabrik_element/display/display.php b/plugins/fabrik_element/display/display.php
index f4b1b47f024..beafac27d89 100644
--- a/plugins/fabrik_element/display/display.php
+++ b/plugins/fabrik_element/display/display.php
@@ -65,11 +65,27 @@ public function getLabel($repeatCounter = 0, $tmpl = '')
 		if (!$params->get('display_showlabel', true))
 		{
 			$element->label = $this->getValue(array());
+			$element->label_raw = $element->label;
 		}
 
 		return parent::getLabel($repeatCounter, $tmpl);
 	}
 
+	/**
+	 * Get the element's raw label (used for details view, not wrapped in <label> tags
+	 *
+	 * @return  string  Label
+	 */
+	protected function getRawLabel()
+	{
+		if (!$this->getParams()->get('display_showlabel', true))
+		{
+			return $this->getValue(array());;
+		}
+
+		return parent::getRawLabel();
+	}
+
 	/**
 	 * Shows the data formatted for the list view
 	 *