mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-22 08:13:14 +02:00
Code Issues Releases Wiki Activity

Merge PR #916 branch 'dhruvgoel92/ticket/11011' into develop

Browse Source 
* 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
This commit is contained in:
Oleg Pudeyev
2012-08-08 03:19:00 -04:00
parent ce32a31b60 a422ddfe31
commit 7c6e1ba109
6 changed files with 314 additions and 318 deletions
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)
{
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;
}