aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/driver/mysqli.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2014-05-26 23:09:51 +0200
committerAndreas Fischer <bantu@phpbb.com>2014-05-26 23:09:51 +0200
commitd646354b0e8f2d14d48c51c11d4462c7087f94c8 (patch)
treecbaffc8574a99b9022e4d3c731d1388c1ebf410e /phpBB/phpbb/db/driver/mysqli.php
parent502cbad5a7f8896311a616553cff9d83ccc87497 (diff)
parentfcdf1101cba7999081f12bca2f5f96ef7769539c (diff)
downloadforums-d646354b0e8f2d14d48c51c11d4462c7087f94c8.tar
forums-d646354b0e8f2d14d48c51c11d4462c7087f94c8.tar.gz
forums-d646354b0e8f2d14d48c51c11d4462c7087f94c8.tar.bz2
forums-d646354b0e8f2d14d48c51c11d4462c7087f94c8.tar.xz
forums-d646354b0e8f2d14d48c51c11d4462c7087f94c8.zip
Merge pull request #2492 from nickvergessen/ticket/12570
[ticket/12570] Fix updating a config with the same value * nickvergessen/ticket/12570: [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.php3
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 != '')
{