From c8421df2ff235ef913efde21fa4fb14d2e7056a9 Mon Sep 17 00:00:00 2001
From: laoneo <allon.moritz@digital-peak.com>
Date: Tue, 26 Apr 2016 09:03:17 +0200
Subject: [PATCH] Show the value from com_fields instead of the the users
 helper

Closes #81
---
 .../com_users/views/profile/tmpl/default_custom.php   | 11 ++++++++++-
 components/com_users/views/profile/view.html.php      |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/components/com_users/views/profile/tmpl/default_custom.php b/components/com_users/views/profile/tmpl/default_custom.php
index edd13c0c93bd5..4dbd2e3692e87 100644
--- a/components/com_users/views/profile/tmpl/default_custom.php
+++ b/components/com_users/views/profile/tmpl/default_custom.php
@@ -23,6 +23,13 @@
 {
 	unset($fieldsets['params']);
 }
+
+$tmp = isset($this->data->fields) ? $this->data->fields : array();
+$customFields = array();
+foreach ($tmp as $customField)
+{
+	$customFields[$customField->alias] = $customField;
+}
 ?>
 <?php foreach ($fieldsets as $group => $fieldset) : ?>
 	<?php $fields = $this->form->getFieldset($group); ?>
@@ -36,7 +43,9 @@
 					<?php if (!$field->hidden && $field->type !== 'Spacer') : ?>
 						<dt><?php echo $field->title; ?></dt>
 						<dd>
-							<?php if (JHtml::isRegistered('users.' . $field->id)) : ?>
+							<?php if (key_exists($field->fieldname, $customFields)) : ?>
+								<?php echo $customFields[$field->fieldname]->value; ?>
+							<?php elseif (JHtml::isRegistered('users.' . $field->id)) : ?>
 								<?php echo JHtml::_('users.' . $field->id, $field->value); ?>
 							<?php elseif (JHtml::isRegistered('users.' . $field->fieldname)) : ?>
 								<?php echo JHtml::_('users.' . $field->fieldname, $field->value); ?>
diff --git a/components/com_users/views/profile/view.html.php b/components/com_users/views/profile/view.html.php
index fae0f554bab92..d5e2c1ad912e2 100644
--- a/components/com_users/views/profile/view.html.php
+++ b/components/com_users/views/profile/view.html.php
@@ -79,6 +79,11 @@ public function display($tpl = null)
 		$this->data->tags = new JHelperTags;
 		$this->data->tags->getItemTags('com_users.user.', $this->data->id);
 
+		JPluginHelper::importPlugin('content');
+		$this->data->text = '';
+		JEventDispatcher::getInstance()->trigger('onContentPrepare', array ('com_users.user', &$this->data, &$this->data->params, 0));
+		unset($this->data->text);
+
 		// Check for layout override
 		$active = JFactory::getApplication()->getMenu()->getActive();