From d1e941f581e17892b7a3cdf6ba2dbdd223257e2a Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Wed, 18 Aug 2021 16:05:20 +0700
Subject: [PATCH] Resolve conflicts

---
 .../com_weblinks/views/category/tmpl/default_items.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/com_weblinks/views/category/tmpl/default_items.php b/src/components/com_weblinks/views/category/tmpl/default_items.php
index d0aac0c..877d265 100644
--- a/src/components/com_weblinks/views/category/tmpl/default_items.php
+++ b/src/components/com_weblinks/views/category/tmpl/default_items.php
@@ -13,9 +13,6 @@ JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
 JHtml::_('behavior.framework');
 
-// Create a shortcut for params.
-$params = &$this->item->params;
-
 // Get the user object.
 $user = JFactory::getUser();
 
@@ -69,7 +66,7 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 
 							<?php if ($canEdit) : ?>
 								<span class="list-edit pull-left width-50">
-									<?php echo JHtml::_('icon.edit', $item, $params); ?>
+									<?php echo JHtml::_('icon.edit', $item, $item->params); ?>
 								</span>
 							<?php endif; ?>
 
@@ -123,9 +120,8 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 								?>
 							</div>
 							<?php $tagsData = $item->tags->getItemTags('com_weblinks.weblink', $item->id); ?>
-							<?php if ($this->params->get('show_tags', 1)) : ?>
-								<?php $this->item->tagLayout = new JLayoutFile('joomla.content.tags'); ?>
-								<?php echo $this->item->tagLayout->render($tagsData); ?>
+							<?php if ($this->params->get('show_tags', 1) && !empty($item->tags->itemTags)) : ?>
+								<?php echo JLayoutHelper::render('joomla.content.tags', $item->tags->itemTags); ?>
 							<?php endif; ?>
 							<?php if (($this->params->get('show_link_description')) && ($item->description != '')) : ?>
 								<?php $images = json_decode($item->images); ?>