From 409dfe52565b850c9a60aa360e9df44bd73f6ce6 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Wed, 23 Dec 2009 15:07:52 +0000 Subject: [PATCH] Fix Bug #55785 - Correct call to mysql_pconnect(). Note: As pointed out by gn#36, phpBB doesn't use persistent connections at all. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10375 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/db/mysql.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 085c46ba52..f38408956a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -123,6 +123,7 @@
  • [Fix] Use correct limit config parameter in the News feed.
  • [Fix] Restrict search for styles/../style.cfg to folders. (Bug #55665)
  • [Fix] Add ability to disable overall (aka board-wide) feed.
    • +
  • [Fix] Do not pass new_link parameter when creating a persistent connection with the mysql. (Bug #55785)
  • [Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)
  • [Change] Log activation through inactive users ACP. (Bug #30145)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
    • diff --git a/phpBB/includes/db/mysql.php b/phpBB/includes/db/mysql.php index c03b38708c..0487dfa6d2 100644 --- a/phpBB/includes/db/mysql.php +++ b/phpBB/includes/db/mysql.php @@ -44,7 +44,7 @@ class dbal_mysql extends dbal $this->sql_layer = 'mysql4'; - $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); + $this->db_connect_id = ($this->persistency) ? @mysql_pconnect($this->server, $this->user, $sqlpassword) : @mysql_connect($this->server, $this->user, $sqlpassword, $new_link); if ($this->db_connect_id && $this->dbname != '') {