makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11011] passing global variables

Browse source 
Pass global variables to class constructor when making a new object.

PHPBB3-11011
This commit is contained in:
Dhruv 2012-07-24 12:10:22 +05:30
parent 33c6d7c8be
commit 2e218776bb
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/acp/acp_search.php
View file

@ -596,7 +596,7 @@ class acp_search
*/ */
function init_search($type, &$search, &$error) function init_search($type, &$search, &$error)
{ {
global $phpbb_root_path, $phpEx, $user; global $phpbb_root_path, $phpEx, $user, $config, $db;
if (!class_exists($type) || !method_exists($type, 'keyword_search')) if (!class_exists($type) || !method_exists($type, 'keyword_search'))
{ {
@ -605,7 +605,7 @@ class acp_search
} }
$error = false; $error = false;
$search = new $type($error); $search = new $type($error, $phpbb_root_path, $phpEx, $config, $db, $user);
return $error; return $error;
} }

4
phpBB/includes/search/fulltext_native.php
View file

@ -342,11 +342,7 @@ class phpbb_search_fulltext_native extends phpbb_search_base
// throw an error if we shall not ignore unexistant words // throw an error if we shall not ignore unexistant words
else if (!$ignore_no_id && sizeof($non_common_words)) else if (!$ignore_no_id && sizeof($non_common_words))
{ {
<<<<<<< HEAD
trigger_error(sprintf($user->lang['WORDS_IN_NO_POST'], implode($user->lang['COMMA_SEPARATOR'], $non_common_words))); trigger_error(sprintf($user->lang['WORDS_IN_NO_POST'], implode($user->lang['COMMA_SEPARATOR'], $non_common_words)));
=======
trigger_error(sprintf($this->user->lang['WORDS_IN_NO_POST'], implode(', ', $non_common_words)));
>>>>>>> 1ee5f46... [ticket/11011] remove global keyword in native search
} }
unset($non_common_words); unset($non_common_words);
} }

2
phpBB/search.php
View file

@ -280,7 +280,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
} }
// We do some additional checks in the module to ensure it can actually be utilised // We do some additional checks in the module to ensure it can actually be utilised
$error = false; $error = false;
$search = new $search_type($error); $search = new $search_type($error, $phpbb_root_path, $phpEx, $config, $db, $user);
if ($error) if ($error)
{ {