From f6a5e30925ecd36732675035c08e9ea00869e1e9 Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <github@joomdonation.com>
Date: Tue, 17 Aug 2021 20:07:32 +0700
Subject: [PATCH] Revert "Show custom fields in category view"

This reverts commit c4b4dfcc6fcaa1a9817654ba752b54fc1a6d90b3.
---
 .../src/Extension/WeblinksComponent.php             | 13 +++++++++----
 .../com_weblinks/src/View/Category/HtmlView.php     |  8 --------
 .../com_weblinks/tmpl/category/default_items.php    | 10 ++--------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/src/administrator/components/com_weblinks/src/Extension/WeblinksComponent.php b/src/administrator/components/com_weblinks/src/Extension/WeblinksComponent.php
index 8ba97b6..0595b4e 100644
--- a/src/administrator/components/com_weblinks/src/Extension/WeblinksComponent.php
+++ b/src/administrator/components/com_weblinks/src/Extension/WeblinksComponent.php
@@ -80,11 +80,16 @@ class WeblinksComponent extends MVCComponent implements CategoryServiceInterface
 	 */
 	public function validateSection($section, $item = null)
 	{
-		// On the front end we need to map some sections
-
-		if (Factory::getApplication()->isClient('site') && in_array($section, ['category', 'form']))
+		if (Factory::getApplication()->isClient('site'))
 		{
-			$section = 'weblink';
+			// On the front end we need to map some sections
+			switch ($section)
+			{
+				// Adding/Editing a weblink
+				case 'form':
+					$section = 'weblink';
+					break;
+			}
 		}
 
 		if ($section != 'weblink')
diff --git a/src/components/com_weblinks/src/View/Category/HtmlView.php b/src/components/com_weblinks/src/View/Category/HtmlView.php
index dcb9b87..d7eacf2 100644
--- a/src/components/com_weblinks/src/View/Category/HtmlView.php
+++ b/src/components/com_weblinks/src/View/Category/HtmlView.php
@@ -29,14 +29,6 @@ class HtmlView extends CategoryView
 	 */
 	protected  $extension = 'com_weblinks';
 
-	/**
-	 * Run the standard Joomla plugins
-	 *
-	 * @var    boolean
-	 * @since  4.0
-	 */
-	protected $runPlugins = true;
-
 	/**
 	 * Execute and display a template script.
 	 *
diff --git a/src/components/com_weblinks/tmpl/category/default_items.php b/src/components/com_weblinks/tmpl/category/default_items.php
index 1d35e4b..769bd2e 100644
--- a/src/components/com_weblinks/tmpl/category/default_items.php
+++ b/src/components/com_weblinks/tmpl/category/default_items.php
@@ -130,8 +130,8 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 								$modalParams['modalWidth'] = 80;
 								echo HTMLHelper::_('bootstrap.renderModal', $modalId, $modalParams);
 								echo '<button type="button" class="btn btn-link" data-bs-toggle="modal" data-bs-target="#' . $modalId . '">
-								  ' . $item->title . '
-								</button>';
+                                  ' . $item->title . '
+                                </button>';
 								break;
 							default:
 								// Open in parent window
@@ -146,12 +146,6 @@ $listDirn  = $this->escape($this->state->get('list.direction'));
 								</div>
 							<?php endif; ?>
 
-							<?php // Content is generated by content plugin event "onContentAfterTitle" ?>
-							<?php echo $item->event->afterDisplayTitle; ?>
-
-							<?php // Content is generated by content plugin event "onContentBeforeDisplay" ?>
-							<?php echo $item->event->beforeDisplayContent; ?>
-
 							<?php if ($this->params->get('show_tags', 1) && !empty($item->tags->itemTags)) : ?>
 								<div class="mt-2 mb-2">
 									<?php echo LayoutHelper::render('joomla.content.tags', $item->tags->itemTags); ?>