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 /phpBB/phpbb/search | |
| 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
Diffstat (limited to 'phpBB/phpbb/search')
| -rw-r--r-- | phpBB/phpbb/search/fulltext_sphinx.php | 4 |
1 files changed, 2 insertions, 2 deletions
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\''), |