aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/postgres.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-05-14 02:51:56 +0200
committerNils Adermann <naderman@naderman.de>2010-05-14 02:51:56 +0200
commitcf8995210625b31988dd9ae98435bf183ee799e3 (patch)
tree297e2ecfcff8e49c725ca3fd469326067d66ad47 /phpBB/includes/db/postgres.php
parent0ed69d91b2ec7b4b2e86acbc1a9d65b09cad71c1 (diff)
parent478708346e2b046ae474ffb0c2e451a2690ddd2b (diff)
downloadforums-cf8995210625b31988dd9ae98435bf183ee799e3.tar
forums-cf8995210625b31988dd9ae98435bf183ee799e3.tar.gz
forums-cf8995210625b31988dd9ae98435bf183ee799e3.tar.bz2
forums-cf8995210625b31988dd9ae98435bf183ee799e3.tar.xz
forums-cf8995210625b31988dd9ae98435bf183ee799e3.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/7717] Localise default extension groups for attachments [ticket/9598] checkdnsrr() is now available on Windows with PHP 5.3 or later. Change if block order to always call checkdnsrr() if the function is available. [ticket/9173] No longer limit scope of numbers we store in the config table on [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP. [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists. [ticket/9518] Correctly create new connection on PostgreSQL when new connection is forced. [ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases. [ticket/6726] Added localhost/127.0.0.1 note to database server hostname explanation in install language. [feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer. [feature/remote_upload-filesize] When transferring files from a remote webserver, abort the transfer as soon as the allowed filesize has been exceeded. [ticket/9176] Take current board timezone settings into account when setting board date format.
Diffstat (limited to 'phpBB/includes/db/postgres.php')
-rw-r--r--phpBB/includes/db/postgres.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php
index d117e8c948..b3139b3d79 100644
--- a/phpBB/includes/db/postgres.php
+++ b/phpBB/includes/db/postgres.php
@@ -76,7 +76,14 @@ class dbal_postgres extends dbal
$this->persistency = $persistency;
- $this->db_connect_id = ($this->persistency) ? @pg_pconnect($connect_string, $new_link) : @pg_connect($connect_string, $new_link);
+ if ($this->persistency)
+ {
+ $this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW);
+ }
+ else
+ {
+ $this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW);
+ }
if ($this->db_connect_id)
{