From 84ec6b93e7e327c590c0378ce9d16eb24116f8e4 Mon Sep 17 00:00:00 2001
From: Constantin Romankiewicz <constantin@zweiiconkram.de>
Date: Sun, 28 Mar 2021 14:22:51 +0200
Subject: [PATCH 1/2] Fix PHP warnings

Similar to https://github.com/joomla/joomla-cms/pull/27273

Fixes #433.

This PR fixes PHP warnings for the weblinks category view.
---
 .../com_weblinks/views/category/tmpl/default_items.php   | 9 +++------
 1 file changed, 3 insertions(+), 6 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 c49b298..b176561 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; ?>
 
@@ -128,8 +125,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 $tagLayout = new JLayoutFile('joomla.content.tags'); ?>
+							<?php echo $tagLayout->render($tagsData); ?>
 						<?php endif; ?>
 						<?php if (($this->params->get('show_link_description')) and ($item->description != '')) : ?>
 						<?php $images = json_decode($item->images); ?>

From 620f535cebe78afcaaf31c3bd87acf90f27f892a Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Wed, 18 Aug 2021 15:36:02 +0700
Subject: [PATCH 2/2] Improve show tags code

---
 .../com_weblinks/views/category/tmpl/default_items.php      | 6 ++----
 1 file changed, 2 insertions(+), 4 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 b176561..d2e1ae4 100644
--- a/src/components/com_weblinks/views/category/tmpl/default_items.php
+++ b/src/components/com_weblinks/views/category/tmpl/default_items.php
@@ -123,10 +123,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 $tagLayout = new JLayoutFile('joomla.content.tags'); ?>
-							<?php echo $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')) and ($item->description != '')) : ?>
 						<?php $images = json_decode($item->images); ?>