diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-10-19 01:30:26 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-10-19 01:30:26 +0530 |
| commit | 1bb3d6b4105ad22d757eef91210c64b617a0b930 (patch) | |
| tree | d49ffb3fd7e95d5e71baa7925e17891f919a47f8 | |
| parent | b22650d3236e98ac4f3cb79167f54fe508112238 (diff) | |
| parent | c6272fca075f55d089bbd0a4139bf05db7a0daab (diff) | |
| download | forums-1bb3d6b4105ad22d757eef91210c64b617a0b930.tar forums-1bb3d6b4105ad22d757eef91210c64b617a0b930.tar.gz forums-1bb3d6b4105ad22d757eef91210c64b617a0b930.tar.bz2 forums-1bb3d6b4105ad22d757eef91210c64b617a0b930.tar.xz forums-1bb3d6b4105ad22d757eef91210c64b617a0b930.zip | |
Merge branch 'develop-ascraeus' into develop
# By Nils Adermann
# Via Dhruv Goel (1) and Nils Adermann (1)
* develop-ascraeus:
[ticket/13181] Replace database credentials with placeholders in sphinx conf
| -rw-r--r-- | phpBB/language/en/acp/search.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/search/fulltext_sphinx.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index 564d9dd04c..98412cb050 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -83,7 +83,7 @@ $lang = array_merge($lang, array( 'FULLTEXT_SPHINX_PORT_EXPLAIN' => 'Port on which the sphinx search daemon (searchd) listens. Leave empty to use the default Sphinx API port 9312', 'FULLTEXT_SPHINX_WRONG_DATABASE' => 'The sphinx search for phpBB supports MySQL and PostgreSQL only.', 'FULLTEXT_SPHINX_CONFIG_FILE' => 'Sphinx config file', - 'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN' => 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon.', + 'FULLTEXT_SPHINX_CONFIG_FILE_EXPLAIN' => 'The generated content of the sphinx config file. This data needs to be pasted into the sphinx.conf which is used by sphinx search daemon. Replace the [dbuser] and [dbpassword] placeholders with your database credentials.', 'FULLTEXT_SPHINX_NO_CONFIG_DATA' => 'The sphinx data and config directory paths are not defined. Please define them to generate the config file.', 'GENERAL_SEARCH_SETTINGS' => 'General search settings', diff --git a/phpBB/phpbb/search/fulltext_sphinx.php b/phpBB/phpbb/search/fulltext_sphinx.php index 79d68d2ae1..427464eb3c 100644 --- a/phpBB/phpbb/search/fulltext_sphinx.php +++ b/phpBB/phpbb/search/fulltext_sphinx.php @@ -256,8 +256,8 @@ class fulltext_sphinx 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_user', $dbuser), - array('sql_pass', $dbpasswd), + array('sql_user', '[dbuser]'), + array('sql_pass', '[dbpassword]'), array('sql_db', $dbname), array('sql_port', $dbport . ' # optional, default is 3306 for mysql and 5432 for pgsql'), array('sql_query_pre', 'SET NAMES \'utf8\''), |