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
ApiQueryBase: Fix addWhereFld for PHP 7.2
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiQueryBase.php
diff --git
a/includes/api/ApiQueryBase.php
b/includes/api/ApiQueryBase.php
index
fe16134
..
179e6f7
100644
(file)
--- a/
includes/api/ApiQueryBase.php
+++ b/
includes/api/ApiQueryBase.php
@@
-97,9
+97,7
@@
abstract class ApiQueryBase extends ApiBase {
return $this->mQueryModule;
}
return $this->mQueryModule;
}
- /**
- * @see ApiBase::getParent()
- */
+ /** @inheritDoc */
public function getParent() {
return $this->getQuery();
}
public function getParent() {
return $this->getQuery();
}
@@
-121,7
+119,7
@@
abstract class ApiQueryBase extends ApiBase {
* See ApiQuery::getNamedDB() for more information
* @param string $name Name to assign to the database connection
* @param int $db One of the DB_* constants
* See ApiQuery::getNamedDB() for more information
* @param string $name Name to assign to the database connection
* @param int $db One of the DB_* constants
- * @param
array
$groups Query groups
+ * @param
string|string[]
$groups Query groups
* @return IDatabase
*/
public function selectNamedDB( $name, $db, $groups ) {
* @return IDatabase
*/
public function selectNamedDB( $name, $db, $groups ) {
@@
-264,9
+262,7
@@
abstract class ApiQueryBase extends ApiBase {
* @param string|string[] $value Value; ignored if null or empty array;
*/
protected function addWhereFld( $field, $value ) {
* @param string|string[] $value Value; ignored if null or empty array;
*/
protected function addWhereFld( $field, $value ) {
- // Use count() to its full documented capabilities to simultaneously
- // test for null, empty array or empty countable object
- if ( count( $value ) ) {
+ if ( $value !== null && !( is_array( $value ) && !$value ) ) {
$this->where[$field] = $value;
}
}
$this->where[$field] = $value;
}
}