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 "Show protection log on creation-protected pages"
[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
fcd29c3
..
4d1b87b
100644
(file)
--- a/
includes/libs/rdbms/database/DatabaseMysqli.php
+++ b/
includes/libs/rdbms/database/DatabaseMysqli.php
@@
-23,6
+23,7
@@
namespace Wikimedia\Rdbms;
use mysqli;
namespace Wikimedia\Rdbms;
use mysqli;
+use mysqli_result;
use IP;
/**
use IP;
/**
@@
-190,7
+191,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @return bool
*/
protected function mysqlFreeResult( $res ) {
* @return bool
*/
protected function mysqlFreeResult( $res ) {
@@
-200,7
+201,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @return bool
*/
protected function mysqlFetchObject( $res ) {
* @return bool
*/
protected function mysqlFetchObject( $res ) {
@@
-213,7
+214,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @return bool
*/
protected function mysqlFetchArray( $res ) {
* @return bool
*/
protected function mysqlFetchArray( $res ) {
@@
-226,7
+227,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @return mixed
*/
protected function mysqlNumRows( $res ) {
* @return mixed
*/
protected function mysqlNumRows( $res ) {
@@
-287,7
+288,7
@@
class DatabaseMysqli extends DatabaseMysqlBase {
}
/**
}
/**
- * @param mysqli $res
+ * @param mysqli
_result
$res
* @param int $row
* @return mixed
*/
* @param int $row
* @return mixed
*/