makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17455] Remove outdated mysqli_connect_error function existence check

Browse source 
PHPBB-17455
This commit is contained in:
rxu 2025-01-02 17:33:41 +07:00
parent 7540720c79
commit 059e82de8f
No known key found for this signature in database
GPG key ID: 955F0567380E586A
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/phpbb/db/driver/mysqli.php
View file

@ -59,9 +59,12 @@ class mysqli extends \phpbb\db\driver\mysql_base
} }
} }
$this->db_connect_id = mysqli_init(); if (!$this->db_connect_id = mysqli_init())
{
$this->connect_error = 'Failed to initialize MySQLi object.';
if (!@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS)) }
else if (!@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS))
{ {
$this->connect_error = 'Failed to establish a connection to the MySQL database engine. Please ensure MySQL server is running and the database configuration parameters are correct.'; $this->connect_error = 'Failed to establish a connection to the MySQL database engine. Please ensure MySQL server is running and the database configuration parameters are correct.';
} }
@ -357,15 +360,8 @@ class mysqli extends \phpbb\db\driver\mysql_base
if ($this->db_connect_id) if ($this->db_connect_id)
{ {
$error = [ $error = [
'message' => $this->db_connect_id->error, 'message' => $this->db_connect_id->connect_error ?: $this->db_connect_id->error,
'code' => $this->db_connect_id->errno, 'code' => $this->db_connect_id->connect_errno ?: $this->db_connect_id->errno,
];
}
else if (function_exists('mysqli_connect_error'))
{
$error = [
'message' => $this->db_connect_id->connect_error,
'code' => $this->db_connect_id->connect_errno,
]; ];
} }
else else