diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-06-20 22:45:28 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-06-20 22:45:28 +0200 |
| commit | 3496948b9494fe7882502d3c9179445235da9e3e (patch) | |
| tree | e97d4b5dea41aa12e027965d6c2ed77190e422c9 /phpBB/includes/db/postgres.php | |
| parent | 6b1f7a2d9d55604b1b1325932306be08177aabea (diff) | |
| parent | 879bc89524aa98874d6de45dc057cb7ff45bd7ed (diff) | |
| download | forums-3496948b9494fe7882502d3c9179445235da9e3e.tar forums-3496948b9494fe7882502d3c9179445235da9e3e.tar.gz forums-3496948b9494fe7882502d3c9179445235da9e3e.tar.bz2 forums-3496948b9494fe7882502d3c9179445235da9e3e.tar.xz forums-3496948b9494fe7882502d3c9179445235da9e3e.zip | |
Merge branch 'ticket/bantu/9643' into develop-olympus
* ticket/bantu/9643:
[ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
Diffstat (limited to 'phpBB/includes/db/postgres.php')
| -rw-r--r-- | phpBB/includes/db/postgres.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php index b3139b3d79..2a885f1d04 100644 --- a/phpBB/includes/db/postgres.php +++ b/phpBB/includes/db/postgres.php @@ -46,7 +46,10 @@ class dbal_postgres extends dbal if ($sqlserver) { - if (strpos($sqlserver, ':') !== false) + // $sqlserver can carry a port separated by : for compatibility reasons + // If $sqlserver has more than one : it's probably an IPv6 address. + // In this case we only allow passing a port via the $port variable. + if (substr_count($sqlserver, ':') === 1) { list($sqlserver, $port) = explode(':', $sqlserver); } |