Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/62964


Change subject: (bug 38460) Identify which filters triggered auto-flag actions
......................................................................

(bug 38460) Identify which filters triggered auto-flag actions

Auto-abuse was being triggered correctly, but was attempting to perform 
"flagabuse", which does not exist. The correct function is "flag"

Bug: 38460
Change-Id: Id2d1691e3c70c342e1a2b44ab429f1975bbeb688
---
M ArticleFeedbackv5.i18n.php
M api/ApiArticleFeedbackv5.php
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/64/62964/1

diff --git a/ArticleFeedbackv5.i18n.php b/ArticleFeedbackv5.i18n.php
index 90c8789..c8cba78 100644
--- a/ArticleFeedbackv5.i18n.php
+++ b/ArticleFeedbackv5.i18n.php
@@ -708,7 +708,7 @@
 
        /* Custom AbuseFilter actions */
        'abusefilter-edit-action-aftv5flagabuse' => '(Article Feedback) 
Auto-flag as abuse',
-       'articlefeedbackv5-abusefilter-note-aftv5flagabuse' => 'Automatically 
flagged as abuse. Rule: $1',
+       'articlefeedbackv5-abusefilter-note-aftv5flag' => 'Automatically 
flagged as abuse. Rule: $1',
        'abusefilter-edit-action-aftv5hide' => '(Article Feedback) Auto-hide',
        'articlefeedbackv5-abusefilter-note-aftv5hide' => 'Automatically 
hidden. Rule: $1',
        'abusefilter-edit-action-aftv5request' => '(Article Feedback) 
Auto-request oversight',
@@ -2106,7 +2106,7 @@
 It must be: {{msg-mw|mypreferences}} > {{msg-mw|prefs-rendering}}',
        'articlefeedbackv5-disable-flyover-prefbutton' => 'The text of the big 
glossy button used to send the user to their preferences in the tooltip that 
pops up when you click the close button on a feedback trigger link, explaining 
how to remove the Article Feedback tool',
        'abusefilter-edit-action-aftv5flagabuse' => 'The text for the checkbox 
used by Special:AbuseFilter to indicate that a rule should result in the 
feedback being auto-flagged as abuse',
-       'articlefeedbackv5-abusefilter-note-aftv5flagabuse' => 'The note to add 
to the activity log when auto-flagging a new feedback post as abuse 
(<code>$1</code> is the name of the filter)',
+       'articlefeedbackv5-abusefilter-note-aftv5flag' => 'The note to add to 
the activity log when auto-flagging a new feedback post as abuse 
(<code>$1</code> is the name of the filter)',
        'abusefilter-edit-action-aftv5hide' => 'The text for the checkbox used 
by Special:AbuseFilter to indicate that a rule should result in the feedback 
being auto-hidden',
        'articlefeedbackv5-abusefilter-note-aftv5hide' => 'The note to add to 
the activity log when auto-hiding a new feedback post (<code>$1</code> is the 
name of the filter)',
        'abusefilter-edit-action-aftv5request' => 'The text for the checkbox 
used by Special:AbuseFilter to indicate that a rule should result in oversight 
being automatically requested for the feedback',
diff --git a/api/ApiArticleFeedbackv5.php b/api/ApiArticleFeedbackv5.php
index 6350904..e81af95 100644
--- a/api/ApiArticleFeedbackv5.php
+++ b/api/ApiArticleFeedbackv5.php
@@ -204,7 +204,7 @@
        public function callbackAbuseActionFlag( $action, $parameters, $title, 
$vars, $rule_desc ) {
                switch ( $action ) {
                        case 'aftv5flagabuse':
-                               $this->autoFlag['flagabuse'] = $rule_desc;
+                               $this->autoFlag['flag'] = $rule_desc;
                                break;
                        case 'aftv5hide':
                                $this->autoFlag['hide'] = $rule_desc;

-- 
To view, visit https://gerrit.wikimedia.org/r/62964
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id2d1691e3c70c342e1a2b44ab429f1975bbeb688
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to