mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop

Browse Source 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11438:
  [ticket/11438] Add spaces after # comment start and before \ line breaks
  [ticket/11438] Add helpful comments from sample config to ACP output
  [ticket/11438] Add empty sql_query_pre to delta-source
  [ticket/11438] Move backslash to concatenate the query strings correctly
  [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
This commit is contained in:
Oleg Pudeyev
2013-03-20 11:43:14 -04:00
parent b51a66b60b c50af28077
commit 8b464e87f0
3 changed files with 41 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/search/fulltext_sphinx.php
View File

@@ -258,13 +258,13 @@ class phpbb_search_fulltext_sphinx
$config_object = new phpbb_search_sphinx_config($this->config_file_data);
$config_data = array(
'source source_phpbb_' . $this->id . '_main' => array(
array('type', $this->dbtype),
array('type', $this->dbtype . ' # mysql or pgsql'),
// This config value sql_host needs to be changed incase sphinx and sql are on different servers
array('sql_host', $dbhost),
array('sql_host', $dbhost . ' # SQL server host sphinx connects to'),
array('sql_user', $dbuser),
array('sql_pass', $dbpasswd),
array('sql_db', $dbname),
array('sql_port', $dbport),
array('sql_port', $dbport . ' # optional, default is 3306 for mysql and 5432 for pgsql'),
array('sql_query_pre', 'SET NAMES \'utf8\''),
array('sql_query_pre', 'UPDATE ' . SPHINX_TABLE . ' SET max_doc_id = (SELECT MAX(post_id) FROM ' . POSTS_TABLE . ') WHERE counter_id = 1'),
array('sql_query_range', 'SELECT MIN(post_id), MAX(post_id) FROM ' . POSTS_TABLE . ''),

2
phpBB/includes/search/sphinx/config_variable.php
View File

@@ -75,6 +75,6 @@ class phpbb_search_sphinx_config_variable
*/
function to_string()
{
return "\t" . $this->name . ' = ' . str_replace("\n", "\\\n", $this->value) . ' ' . $this->comment . "\n";
return "\t" . $this->name . ' = ' . str_replace("\n", " \\\n", $this->value) . ' ' . $this->comment . "\n";
}
}