diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-26 23:09:51 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-26 23:09:51 +0200 |
| commit | ef96f8aa2ca7a2bb7ef97d9dd73b40c6a33aa552 (patch) | |
| tree | ea64137ba7428d756c232fdb4178375cb9efb2fc /phpBB/phpbb/db/driver/mysqli.php | |
| parent | cfa9d239886d3fca33d7942c0ce5aa36858c014f (diff) | |
| parent | d646354b0e8f2d14d48c51c11d4462c7087f94c8 (diff) | |
| download | forums-ef96f8aa2ca7a2bb7ef97d9dd73b40c6a33aa552.tar forums-ef96f8aa2ca7a2bb7ef97d9dd73b40c6a33aa552.tar.gz forums-ef96f8aa2ca7a2bb7ef97d9dd73b40c6a33aa552.tar.bz2 forums-ef96f8aa2ca7a2bb7ef97d9dd73b40c6a33aa552.tar.xz forums-ef96f8aa2ca7a2bb7ef97d9dd73b40c6a33aa552.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12570] Keep MySQLi procedural
[ticket/12570] Remove test for affected rows after SELECT
[ticket/12570] Add a test for set_array() and updating with the same value
[ticket/12570] Fix MySQL affectedrows
[ticket/12570] Fix MySQLi affectedrows by specifying MYSQLI_CLIENT_FOUND_ROWS
[ticket/12570] Add a unit test to show broken sql_affectedrows()
[ticket/12570] Add test for updating a config with the same value
Diffstat (limited to 'phpBB/phpbb/db/driver/mysqli.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/mysqli.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index 6814599b24..39df175860 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -57,7 +57,8 @@ class mysqli extends \phpbb\db\driver\mysql_base } } - $this->db_connect_id = @mysqli_connect($this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket); + $this->db_connect_id = mysqli_init(); + @mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS); if ($this->db_connect_id && $this->dbname != '') { |