mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 22:26:32 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into develop

Browse Source
This commit is contained in:
David King
2012-08-15 12:32:34 -04:00
parent ff8757ce65 938805106c
commit 485710e016
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_posting.php
View File

@ -2370,7 +2370,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u
} }
$error = false; $error = false;
$search = new $search_type($error); $search = new $search_type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user);
if ($error) if ($error)
{ {

4
phpBB/install/install_convert.php
View File

@ -569,7 +569,7 @@ class install_convert extends module
*/ */
function convert_data($sub) 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 $convert, $convert_row, $message_parser, $skip_rows, $language;
global $request; global $request;
@ -750,7 +750,7 @@ class install_convert extends module
} }
$error = false; $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) if ($error)
{ {

4
phpBB/install/install_install.php
View File

@ -1427,7 +1427,7 @@ class install_install extends module
*/ */
function build_search_index($mode, $sub) 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 // Obtain any submitted data
$data = $this->get_submitted_data(); $data = $this->get_submitted_data();
@ -1463,7 +1463,7 @@ class install_install extends module
set_config_count(null, null, null, $config); set_config_count(null, null, null, $config);
$error = false; $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 $sql = 'SELECT post_id, post_subject, post_text, poster_id, forum_id
FROM ' . POSTS_TABLE; FROM ' . POSTS_TABLE;