From 5517fa599e16be4a1e098a8f3f9c899c75170d48 Mon Sep 17 00:00:00 2001
From: amitranjan2 <amit1iitp@gmail.com>
Date: Sun, 27 Jan 2019 00:51:08 +0530
Subject: [PATCH 1/5] fix

---
 .../com_finder/tmpl/filters/default.php       | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index 577e852e8b035..f4a1abdc0e173 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -10,16 +10,21 @@
 defined('_JEXEC') or die;
 
 use Joomla\CMS\HTML\HTMLHelper;
+use Joomla\CMS\Language\Text;
 
-$user      = JFactory::getUser();
+use Joomla\CMS\Factory;
+use Joomla\CMS\Router\Route;
+
+
+$user      = Factory::getUser();
 $userId    = $user->get('id');
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn  = $this->escape($this->state->get('list.direction'));
 
-JText::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
+Text::script('COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT');
 HTMLHelper::_('script', 'com_finder/filters.js', ['version' => 'auto', 'relative' => true]);
 ?>
-<form action="<?php echo JRoute::_('index.php?option=com_finder&view=filters'); ?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo Route::_('index.php?option=com_finder&view=filters'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
 		<div id="j-sidebar-container" class="col-md-2">
 			<?php echo $this->sidebar; ?>
@@ -29,7 +34,7 @@
 				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-warning">
-						<?php echo JText::_('COM_FINDER_NO_RESULTS_OR_FILTERS'); ?>
+						<?php echo Text::_('COM_FINDER_NO_RESULTS_OR_FILTERS'); ?>
 					</div>
 				<?php else : ?>
 				<table class="table">
@@ -39,25 +44,25 @@
 					<thead>
 						<tr>
 							<td style="width:1%" class="text-center">
-								<?php echo JHtml::_('grid.checkall'); ?>
+								<?php echo HTMLHelper::_('grid.checkall'); ?>
 							</td>
 							<th scope="col" style="width:1%">
-								<?php echo JHtml::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'JSTATUS', 'a.state', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col">
-								<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" style="width:10%" class="d-none d-md-table-cell">
-								<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_BY', 'a.created_by_alias', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_BY', 'a.created_by_alias', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" style="width:10%" class="d-none d-md-table-cell">
-								<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_ON', 'a.created', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_CREATED_ON', 'a.created', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" style="width:5%" class="d-none d-md-table-cell">
-								<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'COM_FINDER_HEADING_MAP_COUNT', 'a.map_count', $listDirn, $listOrder); ?>
 							</th>
 							<th scope="col" style="width:1%" class="d-none d-md-table-cell">
-								<?php echo JHtml::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.filter_id', $listDirn, $listOrder); ?>
+								<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.filter_id', $listDirn, $listOrder); ?>
 							</th>
 						</tr>
 					</thead>
@@ -75,17 +80,17 @@
 						?>
 						<tr class="row<?php echo $i % 2; ?>">
 							<td class="text-center">
-								<?php echo JHtml::_('grid.id', $i, $item->filter_id); ?>
+								<?php echo HTMLHelper::_('grid.id', $i, $item->filter_id); ?>
 							</td>
 							<td class="text-center">
-								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
+								<?php echo HTMLHelper::_('jgrid.published', $item->state, $i, 'filters.', $canChange); ?>
 							</td>
 							<th scope="row">
 								<?php if ($item->checked_out) : ?>
-									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckIn); ?>
+									<?php echo HTMLHelper::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'filters.', $canCheckIn); ?>
 								<?php endif; ?>
 								<?php if ($canEdit) : ?>
-									<a href="<?php echo JRoute::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
+									<a href="<?php echo Route::_('index.php?option=com_finder&task=filter.edit&filter_id=' . (int) $item->filter_id); ?>">
 										<?php echo $escapedTitle; ?></a>
 								<?php else : ?>
 									<?php echo $escapedTitle; ?>
@@ -95,7 +100,7 @@
 								<?php echo $item->created_by_alias ?: $item->user_name; ?>
 							</td>
 							<td class="d-none d-md-table-cell">
-								<?php echo JHtml::_('date', $item->created, JText::_('DATE_FORMAT_LC4')); ?>
+								<?php echo HTMLHelper::_('date', $item->created, Text::_('DATE_FORMAT_LC4')); ?>
 							</td>
 							<td class="d-none d-md-table-cell">
 								<?php echo $item->map_count; ?>
@@ -114,7 +119,7 @@
 				<?php endif; ?>
 				<input type="hidden" name="task" value="">
 				<input type="hidden" name="boxchecked" value="0">
-				<?php echo JHtml::_('form.token'); ?>
+				<?php echo HTMLHelper::_('form.token'); ?>
 			</div>
 		</div>
 	</div>

From c5ee1db639886d38c99ea3e7d212cfee8ff62a1a Mon Sep 17 00:00:00 2001
From: amitranjan2 <amit1iitp@gmail.com>
Date: Sun, 27 Jan 2019 00:52:10 +0530
Subject: [PATCH 2/5] fix

---
 administrator/components/com_finder/tmpl/filters/default.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index f4a1abdc0e173..ecf7a50fba8d5 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -11,7 +11,6 @@
 
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-
 use Joomla\CMS\Factory;
 use Joomla\CMS\Router\Route;
 

From 6be7785c7f0fd7da29741f169bb842960d379df3 Mon Sep 17 00:00:00 2001
From: amitranjan2 <amit1iitp@gmail.com>
Date: Sun, 27 Jan 2019 00:55:54 +0530
Subject: [PATCH 3/5] fix

---
 administrator/components/com_finder/tmpl/filters/default.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index ecf7a50fba8d5..a0676c5914acd 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -13,7 +13,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Router\Route;
-
+use Joomla\CMS\Layout\LayoutHelper;
 
 $user      = Factory::getUser();
 $userId    = $user->get('id');
@@ -30,7 +30,7 @@
 		</div>
 		<div class="col-md-10">
 			<div id="j-main-container" class="j-main-container">
-				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
+				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>
 					<div class="alert alert-warning">
 						<?php echo Text::_('COM_FINDER_NO_RESULTS_OR_FILTERS'); ?>

From 05cd27520480be8e6510b126f69f2b1264df234f Mon Sep 17 00:00:00 2001
From: AMIT RANJAN <41797766+amitranjan2@users.noreply.github.com>
Date: Tue, 29 Jan 2019 12:33:15 +0530
Subject: [PATCH 4/5] Update default.php

---
 administrator/components/com_finder/tmpl/filters/default.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index a0676c5914acd..1a0f819b73c15 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -9,11 +9,11 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Factory;
+use Joomla\CMS\Layout\LayoutHelper
 use Joomla\CMS\Router\Route;
-use Joomla\CMS\Layout\LayoutHelper;
 
 $user      = Factory::getUser();
 $userId    = $user->get('id');

From 4f020402184847f2055678eedfce85619c5ff2d5 Mon Sep 17 00:00:00 2001
From: Quy <quy@fluxbb.org>
Date: Tue, 29 Jan 2019 13:11:06 +0530
Subject: [PATCH 5/5] Update
 administrator/components/com_finder/tmpl/filters/default.php

Co-Authored-By: amitranjan2 <41797766+amitranjan2@users.noreply.github.com>
---
 administrator/components/com_finder/tmpl/filters/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_finder/tmpl/filters/default.php b/administrator/components/com_finder/tmpl/filters/default.php
index 1a0f819b73c15..c6477908bcd29 100644
--- a/administrator/components/com_finder/tmpl/filters/default.php
+++ b/administrator/components/com_finder/tmpl/filters/default.php
@@ -12,7 +12,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper
+use Joomla\CMS\Layout\LayoutHelper;
 use Joomla\CMS\Router\Route;
 
 $user      = Factory::getUser();