diff options
| author | brunoais <brunoaiss@gmail.com> | 2015-03-11 17:46:42 +0000 |
|---|---|---|
| committer | brunoais <brunoaiss@gmail.com> | 2015-03-12 12:21:15 +0000 |
| commit | c3a0e09ddbb53dc77d2d78725f934625266065f3 (patch) | |
| tree | 094cc17bd3a3355645c615b96f5c44d54f199eaf /phpBB/includes/acp | |
| parent | 2348580255b19919e2b0d22143be72494a79e527 (diff) | |
| download | forums-c3a0e09ddbb53dc77d2d78725f934625266065f3.tar forums-c3a0e09ddbb53dc77d2d78725f934625266065f3.tar.gz forums-c3a0e09ddbb53dc77d2d78725f934625266065f3.tar.bz2 forums-c3a0e09ddbb53dc77d2d78725f934625266065f3.tar.xz forums-c3a0e09ddbb53dc77d2d78725f934625266065f3.zip | |
[ticket/13685] Add phpbb_dispatcher to fulltext search constructors
PHPBB3-13685
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..3d8991fb37 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, $phpbb_dispatcher, $user); if (!$search->index_created()) { diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index eddc6871f8..37b890c777 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -599,7 +599,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')) { @@ -608,7 +608,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, $phpbb_dispatcher, $user); return $error; } |