diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-09 14:27:13 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-09 14:27:13 +0200 |
| commit | 072f4c926072ba4c7a64749e6a2a8118048ed83e (patch) | |
| tree | 2dab1eb766b4996dd646dd1e333c74faa8fbf6cc /phpBB/includes/acp | |
| parent | 12142108645f550fa376da1aa2d3223a4f9b5dca (diff) | |
| parent | 3ac95f48f8f087b05da6cb065817fad41242730e (diff) | |
| download | forums-072f4c926072ba4c7a64749e6a2a8118048ed83e.tar forums-072f4c926072ba4c7a64749e6a2a8118048ed83e.tar.gz forums-072f4c926072ba4c7a64749e6a2a8118048ed83e.tar.bz2 forums-072f4c926072ba4c7a64749e6a2a8118048ed83e.tar.xz forums-072f4c926072ba4c7a64749e6a2a8118048ed83e.zip | |
Merge pull request #3479 from brunoais/ticket/13685
[ticket/13685] Allow modifying the query for mysql native fulltext search
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 48ca05a118..f6d728ffed 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -632,7 +632,7 @@ class acp_main { $error = false; $search_type = $config['search_type']; - $search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); + $search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user, $phpbb_dispatcher); if (!$search->index_created()) { diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 9ff999567a..abb8301507 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -598,7 +598,7 @@ class acp_search */ function init_search($type, &$search, &$error) { - global $phpbb_root_path, $phpEx, $user, $auth, $config, $db; + global $phpbb_root_path, $phpEx, $user, $auth, $config, $db, $phpbb_dispatcher; if (!class_exists($type) || !method_exists($type, 'keyword_search')) { @@ -607,7 +607,7 @@ class acp_search } $error = false; - $search = new $type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); + $search = new $type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user, $phpbb_dispatcher); return $error; } |