diff options
| author | David King <imkingdavid@gmail.com> | 2012-08-15 12:32:34 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-08-15 12:32:34 -0400 |
| commit | 485710e016e50579012145f396bd059e06c1edbf (patch) | |
| tree | 68b5692233fb2c88051e2882a86a615a828e37b4 | |
| parent | ff8757ce65fcf24f63c849d914e6165fccb0e6c4 (diff) | |
| parent | 938805106c75499eb953d1a22a1ce772c21252de (diff) | |
| download | forums-485710e016e50579012145f396bd059e06c1edbf.tar forums-485710e016e50579012145f396bd059e06c1edbf.tar.gz forums-485710e016e50579012145f396bd059e06c1edbf.tar.bz2 forums-485710e016e50579012145f396bd059e06c1edbf.tar.xz forums-485710e016e50579012145f396bd059e06c1edbf.zip | |
Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into develop
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_convert.php | 4 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 6c21b0f412..4d09367934 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2370,7 +2370,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u } $error = false; - $search = new $search_type($error); + $search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); if ($error) { diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index ca3994d129..b8045cb98b 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -569,7 +569,7 @@ class install_convert extends module */ function convert_data($sub) { - global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache; + global $template, $user, $phpbb_root_path, $phpEx, $db, $lang, $config, $cache, $auth; global $convert, $convert_row, $message_parser, $skip_rows, $language; global $request; @@ -750,7 +750,7 @@ class install_convert extends module } $error = false; - $convert->fulltext_search = new $search_type($error); + $convert->fulltext_search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); if ($error) { diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 40dee7b3d7..23593ee51f 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1427,7 +1427,7 @@ class install_install extends module */ function build_search_index($mode, $sub) { - global $db, $lang, $phpbb_root_path, $phpEx, $config; + global $db, $lang, $phpbb_root_path, $phpEx, $config, $auth, $user; // Obtain any submitted data $data = $this->get_submitted_data(); @@ -1463,7 +1463,7 @@ class install_install extends module set_config_count(null, null, null, $config); $error = false; - $search = new phpbb_search_fulltext_native($error); + $search = new phpbb_search_fulltext_native($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); $sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id FROM ' . POSTS_TABLE; |