diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-08 17:34:04 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-04-08 17:34:04 +0000 |
| commit | a2ac7a6cc69228b959a1bf3f79acd649d0059110 (patch) | |
| tree | bcac16546e413011d46b9c8bec8262a6efe395ff /phpBB/includes | |
| parent | 1e0ee65aede2ba8c8d5b95542bb6f2eed35003ce (diff) | |
| download | forums-a2ac7a6cc69228b959a1bf3f79acd649d0059110.tar forums-a2ac7a6cc69228b959a1bf3f79acd649d0059110.tar.gz forums-a2ac7a6cc69228b959a1bf3f79acd649d0059110.tar.bz2 forums-a2ac7a6cc69228b959a1bf3f79acd649d0059110.tar.xz forums-a2ac7a6cc69228b959a1bf3f79acd649d0059110.zip | |
- fix for a php bug (not able to connect on custom ports if the server is localhost - though 127.0.0.1 works) -> #1444
git-svn-id: file:///svn/phpbb/trunk@5774 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/db/mysqli.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php index 3b0abe8e81..137ca39591 100644 --- a/phpBB/includes/db/mysqli.php +++ b/phpBB/includes/db/mysqli.php @@ -39,10 +39,12 @@ class dbal_mysqli extends dbal { $this->persistency = $persistency; $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); + $this->server = $sqlserver; $this->dbname = $database; + $port = (!$port) ? NULL : $port; - $this->db_connect_id = ($this->persistency) ? @mysqli_pconnect($this->server, $this->user, $sqlpassword) : @mysqli_connect($this->server, $this->user, $sqlpassword); + // Persistant connections not supported by the mysqli extension? + $this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port); if ($this->db_connect_id && $this->dbname != '') { @@ -289,6 +291,14 @@ class dbal_mysqli extends dbal */ function _sql_error() { + if (!$this->db_connect_id) + { + return array( + 'message' => @mysqli_connect_error(), + 'code' => @mysqli_connect_errno() + ); + } + return array( 'message' => @mysqli_error($this->db_connect_id), 'code' => @mysqli_errno($this->db_connect_id) |