Merge branch 'staging' of github.com:joomla/joomla-cms into com_contact

joomla · Sep 15, 2017 · fdb3812 · fdb3812
2 parents c34ba15 + 131052f
commit fdb3812
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/components/com_search/controller.php b/components/com_search/controller.php
@@ -45,7 +45,7 @@ public function search()
 	{
 		// Slashes cause errors, <> get stripped anyway later on. # causes problems.
 		$badchars = array('#', '>', '<', '\\');
-		$searchword = trim(str_replace($badchars, '', $this->input->getString('searchword', null, 'post')));
+		$searchword = trim(str_replace($badchars, '', $this->input->post->getString('searchword')));
 
 		// If searchword enclosed in double quotes, strip quotes and do exact match
 		if (substr($searchword, 0, 1) === '"' && substr($searchword, -1) === '"')
@@ -58,9 +58,9 @@ public function search()
 			$post['searchword'] = $searchword;
 		}
 
-		$post['ordering']     = $this->input->getWord('ordering', null, 'post');
-		$post['searchphrase'] = $this->input->getWord('searchphrase', 'all', 'post');
-		$post['limit']        = $this->input->getUInt('limit', null, 'post');
+		$post['ordering']     = $this->input->post->getWord('ordering');
+		$post['searchphrase'] = $this->input->post->getWord('searchphrase', 'all');
+		$post['limit']        = $this->input->post->getUInt('limit');
 
 		if ($post['limit'] === null)
 		{