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/install | |
| 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/install')
| -rw-r--r-- | phpBB/install/install_convert.php | 4 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index e16c79474b..b132ece0d0 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -619,7 +619,7 @@ class install_convert extends module { global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache, $auth; global $convert, $convert_row, $message_parser, $skip_rows, $language; - global $request, $phpbb_config_php_file; + global $request, $phpbb_config_php_file, $phpbb_dispatcher; extract($phpbb_config_php_file->get_all()); @@ -796,7 +796,7 @@ class install_convert extends module } $error = false; - $convert->fulltext_search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); + $convert->fulltext_search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $phpbb_dispatcher, $user); if ($error) { diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 3a6858a254..f9bd5db204 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1461,7 +1461,7 @@ class install_install extends module */ function build_search_index($mode, $sub) { - global $db, $lang, $phpbb_root_path, $phpEx, $config, $auth, $user; + global $db, $lang, $phpbb_root_path, $phpbb_dispatcher, $phpEx, $config, $auth, $user; // Obtain any submitted data $data = $this->get_submitted_data(); @@ -1494,7 +1494,7 @@ class install_install extends module set_config_count(null, null, null, $config); $error = false; - $search = new \phpbb\search\fulltext_native($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); + $search = new \phpbb\search\fulltext_native($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $phpbb_dispatcher, $user); $sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id FROM ' . POSTS_TABLE; |