dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Warn if stateful ParserOutput transforms are used"
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
database
/
DatabaseMysqli.php
diff --git
a/includes/libs/rdbms/database/DatabaseMysqli.php
b/includes/libs/rdbms/database/DatabaseMysqli.php
index
4d1b87b
..
09ea66c
100644
(file)
--- a/
includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/
includes/libs/rdbms/database/DatabaseMysqli.php
@@
-34,7
+34,7
@@
use IP;
* @see Database
*/
class DatabaseMysqli extends DatabaseMysqlBase {
* @see Database
*/
class DatabaseMysqli extends DatabaseMysqlBase {
- /** @var
$mConn mysqli
*/
+ /** @var
mysqli $mConn
*/
/**
* @param string $sql
/**
* @param string $sql
@@
-91,7
+91,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
$mysqli->ssl_set(
$this->sslKeyPath,
$this->sslCertPath,
$mysqli->ssl_set(
$this->sslKeyPath,
$this->sslCertPath,
-
null
,
+
$this->sslCAFile
,
$this->sslCAPath,
$this->sslCiphers
);
$this->sslCAPath,
$this->sslCiphers
);
@@
-172,7
+172,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
/**
* @return int
*/
/**
* @return int
*/
-
function affectedRows
() {
+
protected function fetchAffectedRowCount
() {
$conn = $this->getBindingHandle();
return $conn->affected_rows;
$conn = $this->getBindingHandle();
return $conn->affected_rows;
@@
-316,7
+316,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
protected function mysqlRealEscapeString( $s ) {
$conn = $this->getBindingHandle();
protected function mysqlRealEscapeString( $s ) {
$conn = $this->getBindingHandle();
- return $conn->real_escape_string( $s );
+ return $conn->real_escape_string(
(string)
$s );
}
/**
}
/**