jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45068) Moodbar always assumed an AbuseFilter hit
......................................................................
(bug 45068) Moodbar always assumed an AbuseFilter hit
After I72e1a6dd7dee19f889fc13b60456e9bfebd5e22b
AbuseFilter::filterAction is returning Status objects instead of
Booleans. As Moodbar kept checking for bool it always assumed a
filter was hit.
Change-Id: I8a4e84bc60555b03f9b02b3d489c9b1e68da3235
---
M include/MoodBarUtil.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Reedy: Looks good to me, approved
Alex Monk: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/include/MoodBarUtil.php b/include/MoodBarUtil.php
index 96d85c5..330a409 100644
--- a/include/MoodBarUtil.php
+++ b/include/MoodBarUtil.php
@@ -58,8 +58,8 @@
$vars->setVar( 'old_wikitext', '' );
$vars->setVar( 'new_wikitext', $value );
$vars->addHolder( AbuseFilter::getEditVars( $title ) );
- $filter_result = AbuseFilter::filterAction( $vars,
$title );
- return $filter_result != '' && $filter_result !== true;
+ $filterStatus = AbuseFilter::filterAction( $vars,
$title );
+ return !$filterStatus->isOK();
}
return false;
@@ -207,4 +207,4 @@
return is_array( $wgMarkAsHelpfulType ) && in_array(
'mbresponse', $wgMarkAsHelpfulType );
}
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/49399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a4e84bc60555b03f9b02b3d489c9b1e68da3235
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MoodBar
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Nischayn22 <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits