jenkins-bot has submitted this change and it was merged. Change subject: Avoid empty list input for DatabaseBase::makeList in subscriptions ......................................................................
Avoid empty list input for DatabaseBase::makeList in subscriptions Bug: T88329 Change-Id: I8d5231288003e21015e126b56af010ad61b93659 (cherry picked from commit b8eeca01fc47ee4bab7b8de544f91fb5aa6c93ba) --- M client/includes/Usage/Sql/SqlSubscriptionManager.php 1 file changed, 23 insertions(+), 18 deletions(-) Approvals: Aude: Looks good to me, approved jenkins-bot: Verified diff --git a/client/includes/Usage/Sql/SqlSubscriptionManager.php b/client/includes/Usage/Sql/SqlSubscriptionManager.php index 1b20b6b..e25eec0 100644 --- a/client/includes/Usage/Sql/SqlSubscriptionManager.php +++ b/client/includes/Usage/Sql/SqlSubscriptionManager.php @@ -117,17 +117,20 @@ * @return string[] Entity ID strings from $subscriptions which $subscriber is already subscribed to. */ private function querySubscriptions( DatabaseBase $db, $subscriber, array $subscriptions ) { - $rows = $db->select( - 'wb_changes_subscription', - 'cs_entity_id', - array( - 'cs_subscriber_id' => $subscriber, - 'cs_entity_id' => $subscriptions, - ), - __METHOD__ - ); + if ( $subscriptions ) { + $rows = $db->select( + 'wb_changes_subscription', + 'cs_entity_id', + array( + 'cs_subscriber_id' => $subscriber, + 'cs_entity_id' => $subscriptions, + ), + __METHOD__ + ); - $subscriptions = $this->extractField( $rows, 'cs_entity_id' ); + $subscriptions = $this->extractField( $rows, 'cs_entity_id' ); + } + return $subscriptions; } @@ -157,14 +160,16 @@ * @param string[] $subscriptions */ private function deleteSubscriptions( DatabaseBase $db, $subscriber, array $subscriptions ) { - $db->delete( - 'wb_changes_subscription', - array( - 'cs_subscriber_id' => $subscriber, - 'cs_entity_id' => $subscriptions, - ), - __METHOD__ - ); + if ( $subscriptions ) { + $db->delete( + 'wb_changes_subscription', + array( + 'cs_subscriber_id' => $subscriber, + 'cs_entity_id' => $subscriptions, + ), + __METHOD__ + ); + } } /** -- To view, visit https://gerrit.wikimedia.org/r/188364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d5231288003e21015e126b56af010ad61b93659 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: wmf/1.25wmf16 Gerrit-Owner: Aude <aude.w...@gmail.com> Gerrit-Reviewer: Aude <aude.w...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits