mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/13930' into ticket/13930-master

Browse Source 
Conflicts:
	phpBB/includes/acp/acp_database.php
This commit is contained in:
Marc Alexander
2015-06-08 15:39:47 +02:00
parent 04c9520c73 f9389995e7
commit 2e31cae7bf
9 changed files with 76 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/search/fulltext_sphinx.php
View File

@@ -139,7 +139,7 @@ class fulltext_sphinx
global $phpbb_container; // TODO inject into object
$this->db_tools = $phpbb_container->get('dbal.tools');
if(!$this->config['fulltext_sphinx_id'])
if (!$this->config['fulltext_sphinx_id'])
{
$this->config->set('fulltext_sphinx_id', unique_id());
}