aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2015-03-23 09:43:43 -0700
committerCesar G <prototech91@gmail.com>2015-03-23 09:43:43 -0700
commit8a6e3f208a5f80ccec71bc11ea698e64cdef3798 (patch)
tree3b2bae17dc93f78e1a24ed7b22da2a764cd236c7
parent8423ae12019e8c10076239216049a4d9418112fb (diff)
parenta32f4869de0c28ed01dce789a2a0d5a5a5f18099 (diff)
downloadforums-8a6e3f208a5f80ccec71bc11ea698e64cdef3798.tar
forums-8a6e3f208a5f80ccec71bc11ea698e64cdef3798.tar.gz
forums-8a6e3f208a5f80ccec71bc11ea698e64cdef3798.tar.bz2
forums-8a6e3f208a5f80ccec71bc11ea698e64cdef3798.tar.xz
forums-8a6e3f208a5f80ccec71bc11ea698e64cdef3798.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/13719] Remove superfluous $search_options in acp_search.
-rw-r--r--phpBB/includes/acp/acp_search.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php
index f7382f826d..e0991158fe 100644
--- a/phpBB/includes/acp/acp_search.php
+++ b/phpBB/includes/acp/acp_search.php
@@ -445,7 +445,6 @@ class acp_search
$search = null;
$error = false;
- $search_options = '';
foreach ($search_types as $type)
{
if ($this->init_search($type, $search, $error) || !method_exists($search, 'index_created'))