mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-30 04:58:37 +01:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
* 3.1.x:
  [ticket/14425] Allow setting unix socket in database tests
This commit is contained in:
Tristan Darricau 2016-01-24 18:00:26 +01:00
commit 36ff2c7b59
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/test_framework/phpbb_database_test_connection_manager.php
View File

@ -84,11 +84,18 @@ class phpbb_database_test_connection_manager
break;
default:
$dsn .= 'host=' . $this->config['dbhost'];
if ($this->config['dbport'])
if (!empty($this->config['dbport']) && !is_numeric($this->config['dbport']) && $this->dbms['PDO'] != 'pgsql')
{
$dsn .= ';port=' . $this->config['dbport'];
$dsn .= 'unix_socket=' . $this->config['dbport'];
}
else
{
$dsn .= 'host=' . $this->config['dbhost'];
if ($this->config['dbport'])
{
$dsn .= ';port=' . $this->config['dbport'];
}
}
if ($use_db)