From 1f0611a4f34d0b5427e690d19fad3c996ddb0d38 Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Wed, 18 Aug 2021 17:26:11 +0700
Subject: [PATCH] Bring some changes from master to 4.0-dev

---
 src/components/com_weblinks/tmpl/category/default_items.php | 5 +----
 src/modules/mod_weblinks/src/Helper/WeblinksHelper.php      | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/com_weblinks/tmpl/category/default_items.php b/src/components/com_weblinks/tmpl/category/default_items.php
index 769bd2e..5cb3524 100644
--- a/src/components/com_weblinks/tmpl/category/default_items.php
+++ b/src/components/com_weblinks/tmpl/category/default_items.php
@@ -17,9 +17,6 @@ use Joomla\CMS\Uri\Uri;
 
 HTMLHelper::_('behavior.core');
 
-// Create a shortcut for params.
-$params = &$this->category->params;
-
 // Get the user object.
 $user = Factory::getApplication()->getIdentity();
 
@@ -78,7 +75,7 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 
 					<?php if ($canEdit || ($canEditOwn && $item->created_by == $userId)) : ?>
 						<div class="icons list-group-item">
-							<?php echo HTMLHelper::_('weblinkicon.edit', $item, $this->params); ?>
+							<?php echo HTMLHelper::_('weblinkicon.edit', $item, $item->params); ?>
 						</div>
 					<?php endif; ?>
 
diff --git a/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php b/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php
index 91be7b1..ff9f11a 100644
--- a/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php
+++ b/src/modules/mod_weblinks/src/Helper/WeblinksHelper.php
@@ -87,7 +87,7 @@ class WeblinksHelper
 
 		$model->setState(
 			'list.select',
-			'a.*, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ', a.created'
+			'a.*, c.description AS c_description, c.published AS c_published,' . $case_when1 . ',' . $case_when2 . ', a.created'
 		);
 
 		$model->setState('filter.c.published', 1);
@@ -114,6 +114,6 @@ class WeblinksHelper
 			return $items;
 		}
 
-		return;
+		return [];
 	}
 }