diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-10-17 16:43:33 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-10-17 16:43:33 +0200 |
| commit | 88d064b6f44624b3a401e84d71188fb1dec564f5 (patch) | |
| tree | 198b07665611a878d1cc5f4a6b438d236dd8c522 | |
| parent | af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4 (diff) | |
| parent | ff0839e76b8e34466a0365c0402a5a4badf3a0ff (diff) | |
| download | forums-88d064b6f44624b3a401e84d71188fb1dec564f5.tar forums-88d064b6f44624b3a401e84d71188fb1dec564f5.tar.gz forums-88d064b6f44624b3a401e84d71188fb1dec564f5.tar.bz2 forums-88d064b6f44624b3a401e84d71188fb1dec564f5.tar.xz forums-88d064b6f44624b3a401e84d71188fb1dec564f5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
| -rw-r--r-- | tests/test_framework/phpbb_database_test_connection_manager.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index a7559e2183..68e09add94 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -69,6 +69,11 @@ class phpbb_database_test_connection_manager default: $dsn .= 'host=' . $this->config['dbhost']; + if ($this->config['dbport']) + { + $dsn .= ';port=' . $this->config['dbport']; + } + if ($use_db) { $dsn .= ';dbname=' . $this->config['dbname']; |