[MediaWiki-commits] [Gerrit] Make sure $found actually contains values - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Make sure $found actually contains values .. Make sure $found actually contains values I had one key where the value was null on my local machine (likely odd test data), which caused a warning when trying to array_merge a couple lines down: Warning: array_merge(): Argument #3 is not an array in includes/Formatter/RecentChangesQuery.php on line 90 Change-Id: I4af443446b030d391cf4daeb1895e0fa9f875289 --- M includes/Formatter/RecentChangesQuery.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Formatter/RecentChangesQuery.php b/includes/Formatter/RecentChangesQuery.php index 94ff62c..b89fd3b 100644 --- a/includes/Formatter/RecentChangesQuery.php +++ b/includes/Formatter/RecentChangesQuery.php @@ -81,6 +81,7 @@ $found[] = $this->storage->getMulti( $type, $uids ); } + $found = array_filter( $found ); $count = count( $found ); if ( $count === 0 ) { $results = array(); -- To view, visit https://gerrit.wikimedia.org/r/166404 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4af443446b030d391cf4daeb1895e0fa9f875289 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie Gerrit-Reviewer: EBernhardson Gerrit-Reviewer: SG Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure $found actually contains values - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/166404 Change subject: Make sure $found actually contains values .. Make sure $found actually contains values I had one key where the value was null on my local machine (likely odd test data), which caused a warning when trying to array_merge a couple lines down: Warning: array_merge(): Argument #3 is not an array in includes/Formatter/RecentChangesQuery.php on line 90 Change-Id: I4af443446b030d391cf4daeb1895e0fa9f875289 --- M includes/Formatter/RecentChangesQuery.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/04/166404/1 diff --git a/includes/Formatter/RecentChangesQuery.php b/includes/Formatter/RecentChangesQuery.php index 94ff62c..b89fd3b 100644 --- a/includes/Formatter/RecentChangesQuery.php +++ b/includes/Formatter/RecentChangesQuery.php @@ -81,6 +81,7 @@ $found[] = $this->storage->getMulti( $type, $uids ); } + $found = array_filter( $found ); $count = count( $found ); if ( $count === 0 ) { $results = array(); -- To view, visit https://gerrit.wikimedia.org/r/166404 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4af443446b030d391cf4daeb1895e0fa9f875289 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Matthias Mullie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits