Merge branch '3.1.x'

* 3.1.x:
  [ticket/13719] Remove superfluous $search_options in acp_search.
This commit is contained in:
Cesar G 2015-03-23 09:43:43 -07:00
commit 8a6e3f208a

View file

@ -445,7 +445,6 @@ class acp_search
$search = null; $search = null;
$error = false; $error = false;
$search_options = '';
foreach ($search_types as $type) foreach ($search_types as $type)
{ {
if ($this->init_search($type, $search, $error) || !method_exists($search, 'index_created')) if ($this->init_search($type, $search, $error) || !method_exists($search, 'index_created'))