diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-16 01:18:15 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-03-16 01:18:15 +0100 |
| commit | c50af280770a9db13043a41e34238a2434176936 (patch) | |
| tree | 891750997a0d193905f1fd10ace3af5f24cb0ed3 /phpBB/includes | |
| parent | 2b2bbf787c55e8922ae1c06242be1120a7e91eb7 (diff) | |
| download | forums-c50af280770a9db13043a41e34238a2434176936.tar forums-c50af280770a9db13043a41e34238a2434176936.tar.gz forums-c50af280770a9db13043a41e34238a2434176936.tar.bz2 forums-c50af280770a9db13043a41e34238a2434176936.tar.xz forums-c50af280770a9db13043a41e34238a2434176936.zip | |
[ticket/11438] Add spaces after # comment start and before \ line breaks
PHPBB3-11438
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 48e6b5aaec..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 . ' #mysql or pgsql'), + 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 . ' #SQL server host sphinx connects to'), + 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 . ' #optional, default is 3306 for mysql and 5432 for pgsql'), + 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"; } } |