Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
This commit is contained in:
Andreas Fischer 2011-10-17 16:43:33 +02:00
commit 88d064b6f4

View file

@ -69,6 +69,11 @@ class phpbb_database_test_connection_manager
default: default:
$dsn .= 'host=' . $this->config['dbhost']; $dsn .= 'host=' . $this->config['dbhost'];
if ($this->config['dbport'])
{
$dsn .= ';port=' . $this->config['dbport'];
}
if ($use_db) if ($use_db)
{ {
$dsn .= ';dbname=' . $this->config['dbname']; $dsn .= ';dbname=' . $this->config['dbname'];