jenkins-bot has submitted this change and it was merged. Change subject: AbuseFilterViewEdit: Correctly reject non-existent historical versions ......................................................................
AbuseFilterViewEdit: Correctly reject non-existent historical versions Return value of this function is already being checked for this. Bug: T125572 Change-Id: I6f1d77d335a7ed269e6fbb9aaf2c3a7a566ae992 --- M Views/AbuseFilterViewEdit.php 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php index 177afca..2197dc7 100755 --- a/Views/AbuseFilterViewEdit.php +++ b/Views/AbuseFilterViewEdit.php @@ -980,7 +980,7 @@ /** * Loads historical data in a form that the editor can understand. * @param $id int History ID - * @return array In the usual format: + * @return array|bool False if the history ID is not valid, otherwise array in the usual format: * First element contains the abuse_filter row (as it was). * Second element contains an array of abuse_filter_action rows. */ @@ -994,6 +994,10 @@ __METHOD__ ); + if ( !$row ) { + return false; + } + return AbuseFilter::translateFromHistory( $row ); } -- To view, visit https://gerrit.wikimedia.org/r/281235 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6f1d77d335a7ed269e6fbb9aaf2c3a7a566ae992 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Bartosz DziewoĆski <matma....@gmail.com> Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com> Gerrit-Reviewer: Reedy <re...@wikimedia.org> Gerrit-Reviewer: Se4598 <se4...@gmx.de> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits