diff options
author | Igor Wiedler <igor@wiedler.ch> | 2011-10-17 02:40:44 +0200 |
---|---|---|
committer | Igor Wiedler <igor@wiedler.ch> | 2011-10-17 02:40:44 +0200 |
commit | ff0839e76b8e34466a0365c0402a5a4badf3a0ff (patch) | |
tree | f2f6400ed66c45cfc600730dc45643ef1e027edb | |
parent | cc227cc6f66aa164705bf0e721558e3e6b75fd0f (diff) | |
parent | fa1d9a4571ac208bbc9379b9e4e3a9a5ae07f0f1 (diff) | |
download | forums-ff0839e76b8e34466a0365c0402a5a4badf3a0ff.tar forums-ff0839e76b8e34466a0365c0402a5a4badf3a0ff.tar.gz forums-ff0839e76b8e34466a0365c0402a5a4badf3a0ff.tar.bz2 forums-ff0839e76b8e34466a0365c0402a5a4badf3a0ff.tar.xz forums-ff0839e76b8e34466a0365c0402a5a4badf3a0ff.zip |
Merge remote-tracking branch 'bantu/ticket/10416' into develop-olympus
* bantu/ticket/10416:
[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']; |