mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-15 14:16:28 +02:00
Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into develop
This commit is contained in:
phpBB
@ -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)
|
||||
{
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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;
|
||||
|
Reference in New Issue
Block a user