diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-03-20 11:43:14 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-03-20 11:43:14 -0400 |
| commit | 8b464e87f0a41422dddaa647ac42ab9c7950bb4b (patch) | |
| tree | dbbc6b3e6688bd154af322e06fd8bb125b69766a /phpBB/includes | |
| parent | b51a66b60bffd0e4e07a7bd8db6532762c52678d (diff) | |
| parent | c50af280770a9db13043a41e34238a2434176936 (diff) | |
| download | forums-8b464e87f0a41422dddaa647ac42ab9c7950bb4b.tar forums-8b464e87f0a41422dddaa647ac42ab9c7950bb4b.tar.gz forums-8b464e87f0a41422dddaa647ac42ab9c7950bb4b.tar.bz2 forums-8b464e87f0a41422dddaa647ac42ab9c7950bb4b.tar.xz forums-8b464e87f0a41422dddaa647ac42ab9c7950bb4b.zip | |
Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop
# 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()
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/search/fulltext_sphinx.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/search/sphinx/config_variable.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index 48445d0794..28761792ec 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -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 . ''), diff --git a/phpBB/includes/search/sphinx/config_variable.php b/phpBB/includes/search/sphinx/config_variable.php index 35abe281cb..2c1d35a49c 100644 --- a/phpBB/includes/search/sphinx/config_variable.php +++ b/phpBB/includes/search/sphinx/config_variable.php @@ -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"; } } |