From 52c995b3cd13604a7705ae9ee0d45e4fac0ba61f Mon Sep 17 00:00:00 2001
From: Sven Hurt <kontakt@sven-hurt.de>
Date: Wed, 5 Jul 2017 13:58:41 +0200
Subject: [PATCH] Update beez layout overrides to use correct params

---
 .../html/com_contact/contact/default.php      | 72 ++++++++++---------
 1 file changed, 37 insertions(+), 35 deletions(-)

diff --git a/templates/beez3/html/com_contact/contact/default.php b/templates/beez3/html/com_contact/contact/default.php
index 8e91433df3a74..9c01684052986 100644
--- a/templates/beez3/html/com_contact/contact/default.php
+++ b/templates/beez3/html/com_contact/contact/default.php
@@ -10,27 +10,29 @@
 defined('_JEXEC') or die;
 
 $cparams = JComponentHelper::getParams('com_media');
+$tparams = $this->item->params;
+
 ?>
 
-<div class="contact<?php echo $this->pageclass_sfx?>">
-	<?php if ($this->params->get('show_page_heading')) : ?>
+<div class="contact<?php echo $this->pageclass_sfx?; >">
+	<?php if ($tparams->get('show_page_heading')) : ?>
 		<h1>
-			<?php echo $this->escape($this->params->get('page_heading')); ?>
+			<?php echo $this->escape($tparams->get('page_heading')); ?>
 		</h1>
 	<?php endif; ?>
-	<?php if ($this->contact->name && $this->params->get('show_name')) : ?>
+	<?php if ($this->contact->name && $tparams->get('show_name')) : ?>
 		<div class="page-header">
 			<h2>
 				<span class="contact-name"><?php echo $this->contact->name; ?></span>
 			</h2>
 		</div>
 	<?php endif;  ?>
-	<?php if ($this->params->get('show_contact_category') === 'show_no_link') : ?>
+	<?php if ($tparams->get('show_contact_category') === 'show_no_link') : ?>
 		<h3>
 			<span class="contact-category"><?php echo $this->contact->category_title; ?></span>
 		</h3>
 	<?php endif; ?>
-	<?php if ($this->params->get('show_contact_category') === 'show_with_link') : ?>
+	<?php if ($tparams->get('show_contact_category') === 'show_with_link') : ?>
 		<?php $contactLink = ContactHelperRoute::getCategoryRoute($this->contact->catid);?>
 		<h3>
 			<span class="contact-category"><a href="<?php echo $contactLink; ?>">
@@ -41,40 +43,40 @@
 
 	<?php echo $this->item->event->afterDisplayTitle; ?>
 
-	<?php if ($this->params->get('show_contact_list') && count($this->contacts) > 1) : ?>
+	<?php if ($tparams->get('show_contact_list') && count($this->contacts) > 1) : ?>
 		<form action="#" method="get" name="selectForm" id="selectForm">
 			<?php echo JText::_('COM_CONTACT_SELECT_CONTACT'); ?>
 			<?php echo JHtml::_('select.genericlist',  $this->contacts, 'id', 'class="inputbox" onchange="document.location.href = this.value"', 'link', 'name', $this->contact->link);?>
 		</form>
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
+	<?php if ($tparams->get('show_tags', 1) && !empty($this->item->tags->itemTags)) : ?>
 		<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
 		<?php echo $this->item->tagLayout->render($this->item->tags->itemTags); ?>
 	<?php endif; ?>
 
 	<?php echo $this->item->event->beforeDisplayContent; ?>
 
-	<?php  if ($this->params->get('presentation_style') === 'sliders') : ?>
+	<?php  if ($tparams->get('presentation_style') === 'sliders') : ?>
 		<?php echo JHtml::_('sliders.start', 'panel-sliders', array('useCookie' => '1')); ?>
 		<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
 	<?php endif; ?>
-	<?php  if ($this->params->get('presentation_style') === 'tabs') : ?>
+	<?php  if ($tparams->get('presentation_style') === 'tabs') : ?>
 		<?php echo JHtmlTabs::start('tabs', array('useCookie' => '1')); ?>
 		<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
 
 	<?php endif; ?>
-	<?php if ($this->params->get('presentation_style') === 'plain'):?>
+	<?php if ($tparams->get('presentation_style') === 'plain'):?>
 		<?php  echo '<h3>' . JText::_('COM_CONTACT_DETAILS') . '</h3>';  ?>
 	<?php endif; ?>
 
-	<?php if ($this->contact->image && $this->params->get('show_image')) : ?>
+	<?php if ($this->contact->image && $tparams->get('show_image')) : ?>
 		<div class="thumbnail pull-right">
 			<?php echo JHtml::_('image', $this->contact->image, $this->contact->name, array('align' => 'middle')); ?>
 		</div>
 	<?php endif; ?>
 
-	<?php if ($this->contact->con_position && $this->params->get('show_position')) : ?>
+	<?php if ($this->contact->con_position && $tparams->get('show_position')) : ?>
 		<dl class="contact-position dl-horizontal">
 			<dd>
 				<?php echo $this->contact->con_position; ?>
@@ -84,40 +86,40 @@
 
 	<?php echo $this->loadTemplate('address'); ?>
 
-	<?php if ($this->params->get('allow_vcard')) :	?>
+	<?php if ($tparams->get('allow_vcard')) : ?>
 		<?php echo JText::_('COM_CONTACT_DOWNLOAD_INFORMATION_AS');?>
 			<a href="<?php echo JRoute::_('index.php?option=com_contact&amp;view=contact&amp;id='.$this->contact->id . '&amp;format=vcf'); ?>">
 			<?php echo JText::_('COM_CONTACT_VCARD');?></a>
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_email_form') && ($this->contact->email_to || $this->contact->user_id)) : ?>
+	<?php if ($tparams->get('show_email_form') && ($this->contact->email_to || $this->contact->user_id)) : ?>
 
-		<?php if ($this->params->get('presentation_style') === 'sliders') : ?>
+		<?php if ($tparams->get('presentation_style') === 'sliders') : ?>
 			<?php echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
 		<?php endif; ?>
-		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+		<?php if ($tparams->get('presentation_style') === 'tabs') : ?>
 			<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
 		<?php endif; ?>
-		<?php if ($this->params->get('presentation_style') === 'plain'):?>
+		<?php if ($tparams->get('presentation_style') === 'plain'):?>
 			<?php  echo '<h3>'. JText::_('COM_CONTACT_EMAIL_FORM').'</h3>';  ?>
 		<?php endif; ?>
 		<?php  echo $this->loadTemplate('form');  ?>
 
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_links')) : ?>
+	<?php if ($tparams->get('show_links')) : ?>
 		<?php echo $this->loadTemplate('links'); ?>
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_articles') && $this->contact->user_id && $this->contact->articles) : ?>
+	<?php if ($tparams->get('show_articles') && $this->contact->user_id && $this->contact->articles) : ?>
 
-		<?php if ($this->params->get('presentation_style') === 'sliders') :
+		<?php if ($tparams->get('presentation_style') === 'sliders') :
 			echo JHtml::_('sliders.panel', JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
 		<?php endif; ?>
-		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+		<?php if ($tparams->get('presentation_style') === 'tabs') : ?>
 			<?php echo JHtmlTabs::panel(JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
 		<?php endif; ?>
-		<?php if  ($this->params->get('presentation_style') === 'plain'):?>
+		<?php if  ($tparams->get('presentation_style') === 'plain'):?>
 			<?php echo '<h3>'. JText::_('JGLOBAL_ARTICLES').'</h3>'; ?>
 		<?php endif; ?>
 
@@ -125,15 +127,15 @@
 
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_profile') && $this->contact->user_id && JPluginHelper::isEnabled('user', 'profile')) : ?>
+	<?php if ($tparams->get('show_profile') && $this->contact->user_id && JPluginHelper::isEnabled('user', 'profile')) : ?>
 
-		<?php if ($this->params->get('presentation_style') === 'sliders') :
+		<?php if ($tparams->get('presentation_style') === 'sliders') :
 			echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
 		<?php endif; ?>
-		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+		<?php if ($tparams->get('presentation_style') === 'tabs') : ?>
 			<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
 		<?php endif; ?>
-		<?php if ($this->params->get('presentation_style') === 'plain'):?>
+		<?php if ($tparams->get('presentation_style') === 'plain'):?>
 			<?php echo '<h3>'. JText::_('COM_CONTACT_PROFILE').'</h3>'; ?>
 		<?php endif; ?>
 
@@ -141,27 +143,27 @@
 
 	<?php endif; ?>
 
-	<?php if ($this->params->get('show_user_custom_fields') && $this->contactUser) : ?>
+	<?php if ($tparams->get('show_user_custom_fields') && $this->contactUser) : ?>
 		<?php echo $this->loadTemplate('user_custom_fields'); ?>
 	<?php endif; ?>
 
-	<?php if ($this->contact->misc && $this->params->get('show_misc')) : ?>
+	<?php if ($this->contact->misc && $tparams->get('show_misc')) : ?>
 
-		<?php if ($this->params->get('presentation_style') === 'sliders') :
+		<?php if ($tparams->get('presentation_style') === 'sliders') :
 			echo JHtml::_('sliders.panel', JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
 		<?php endif; ?>
-		<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
+		<?php if ($tparams->get('presentation_style') === 'tabs') : ?>
 			<?php echo JHtmlTabs::panel(JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
 		<?php endif; ?>
-		<?php if ($this->params->get('presentation_style') === 'plain'):?>
+		<?php if ($tparams->get('presentation_style') === 'plain'):?>
 			<?php echo '<h3>'. JText::_('COM_CONTACT_OTHER_INFORMATION').'</h3>'; ?>
 		<?php endif; ?>
 
 		<div class="contact-miscinfo">
 			<dl class="dl-horizontal">
 				<dt>
-					<span class="<?php echo $this->params->get('marker_class'); ?>">
-						<?php echo $this->params->get('marker_misc'); ?>
+					<span class="<?php echo $tparams->get('marker_class'); ?>">
+						<?php echo $tparams->get('marker_misc'); ?>
 					</span>
 				</dt>
 				<dd>
@@ -173,7 +175,7 @@
 		</div>
 	<?php endif; ?>
 
-	<?php if ($this->params->get('presentation_style') === 'sliders') :
+	<?php if ($tparams->get('presentation_style') === 'sliders') :
 		echo JHtml::_('sliders.end');
 	endif; ?>