From 9254cb91a209e413ebb29f3953d77b0714d5ed47 Mon Sep 17 00:00:00 2001
From: Tuan Pham Ngoc <tuanpn@joomdonation.com>
Date: Mon, 23 Mar 2015 21:04:41 +0700
Subject: [PATCH] Update code to deal with Hathor template.

---
 .../com_content/models/articles.php           | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_content/models/articles.php b/administrator/components/com_content/models/articles.php
index 290528b2c3e8c..33ebb39e0d143 100644
--- a/administrator/components/com_content/models/articles.php
+++ b/administrator/components/com_content/models/articles.php
@@ -78,17 +78,49 @@ protected function populateState($ordering = null, $direction = null)
 	{
 		$app = JFactory::getApplication();
 
+		$input = $app->input;
+
 		// Adjust the context to support modal layouts.
-		if ($layout = $app->input->get('layout'))
+		if ($layout = $input->get('layout'))
 		{
 			$this->context .= '.' . $layout;
 		}
 
+		// Deal with Hathor which is not using search tools
+		$rawInputData = $input->getArray();
+
+		if (isset($rawInputData['filter_search']))
+		{
+			$search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search');
+			$this->setState('filter.search', $search);
+
+			$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access');
+			$this->setState('filter.access', $access);
+
+			$authorId = $app->getUserStateFromRequest($this->context . '.filter.author_id', 'filter_author_id');
+			$this->setState('filter.author_id', $authorId);
+
+			$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
+			$this->setState('filter.published', $published);
+
+			$categoryId = $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id');
+			$this->setState('filter.category_id', $categoryId);
+
+			$level = $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level');
+			$this->setState('filter.level', $level);
+
+			$language = $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
+			$this->setState('filter.language', $language);
+
+			$tag = $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '');
+			$this->setState('filter.tag', $tag);
+		}
+
 		// List state information.
 		parent::populateState('a.id', 'desc');
 
 		// Force a language
-		$forcedLanguage = $app->input->get('forcedLanguage');
+		$forcedLanguage = $input->get('forcedLanguage');
 
 		if (!empty($forcedLanguage))
 		{