diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-06-09 15:24:08 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-06-09 15:24:08 +0200 |
| commit | b2ada8ba090f077678ffd67768ea4038e9bd0a06 (patch) | |
| tree | 0232143f8f335208b4fc8bd5001500cc39f79e49 /phpBB/phpbb/search/fulltext_sphinx.php | |
| parent | d3e55a8290bcec35d7fdf5a00f46ef5bce62e28d (diff) | |
| parent | 072f4c926072ba4c7a64749e6a2a8118048ed83e (diff) | |
| download | forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar.gz forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar.bz2 forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.tar.xz forums-b2ada8ba090f077678ffd67768ea4038e9bd0a06.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/includes/mcp/mcp_main.php
Diffstat (limited to 'phpBB/phpbb/search/fulltext_sphinx.php')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_sphinx.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php index a5ad96b114..082dddeb1a 100644 --- a/phpBB/phpbb/search/fulltext_sphinx.php +++ b/phpBB/phpbb/search/fulltext_sphinx.php @@ -96,6 +96,12 @@ class fulltext_sphinx protected $dbtype; /** + * phpBB event dispatcher object + * @var \phpbb\event\dispatcher_interface + */ + protected $phpbb_dispatcher; + + /** * User object * @var \phpbb\user */ @@ -125,12 +131,14 @@ class fulltext_sphinx * @param \phpbb\config\config $config Config object * @param \phpbb\db\driver\driver_interface Database object * @param \phpbb\user $user User object + * @param \phpbb\event\dispatcher_interface $phpbb_dispatcher Event dispatcher object */ - public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user) + public function __construct(&$error, $phpbb_root_path, $phpEx, $auth, $config, $db, $user, $phpbb_dispatcher) { $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $phpEx; $this->config = $config; + $this->phpbb_dispatcher = $phpbb_dispatcher; $this->user = $user; $this->db = $db; $this->auth = $auth; |