diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-08-08 03:19:00 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-08-08 03:19:00 -0400 |
| commit | 7c6e1ba10986a15b8dd3058d390d14d7d3cd1aa5 (patch) | |
| tree | 5e679f315d090a47a06c63917dcba83dc1b93980 /phpBB/includes/acp | |
| parent | ce32a31b60224e6c87501bb856fef9b00e8c7cd2 (diff) | |
| parent | a422ddfe31af469123f3fa830a3ae313dc9e8ec7 (diff) | |
| download | forums-7c6e1ba10986a15b8dd3058d390d14d7d3cd1aa5.tar forums-7c6e1ba10986a15b8dd3058d390d14d7d3cd1aa5.tar.gz forums-7c6e1ba10986a15b8dd3058d390d14d7d3cd1aa5.tar.bz2 forums-7c6e1ba10986a15b8dd3058d390d14d7d3cd1aa5.tar.xz forums-7c6e1ba10986a15b8dd3058d390d14d7d3cd1aa5.zip | |
Merge PR #916 branch 'dhruvgoel92/ticket/11011' into develop
* dhruvgoel92/ticket/11011:
[ticket/11011] rename property phpEx to php_ext
[ticket/11011] pass $auth to search backend constructor
[ticket/11011] remove global keyword from sphinx
[ticket/11011] pass global variables in construct
[ticket/11011] passing global variables
[ticket/11011] remove global keyword in native search
[ticket/11011] remove global keyword in pgsql search
[ticket/11011] global variables as constructor parameters
[ticket/11011] add access specifiers and docblocks
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_search.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 82d9b021fe..6618e2c3f9 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -596,7 +596,7 @@ class acp_search */ function init_search($type, &$search, &$error) { - global $phpbb_root_path, $phpEx, $user; + global $phpbb_root_path, $phpEx, $user, $auth, $config, $db; if (!class_exists($type) || !method_exists($type, 'keyword_search')) { @@ -605,7 +605,7 @@ class acp_search } $error = false; - $search = new $type($error); + $search = new $type($error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user); return $error; } |