jenkins-bot has submitted this change and it was merged.

Change subject: Add links to abusefilter-edit-done
......................................................................


Add links to abusefilter-edit-done

This adds a link to the diff of the edited filter, and a link to the filter
itself.

Bug: 52590
Change-Id: If741756ef398a61ae0fcd809eaee5a040ac8ca3d
---
M AbuseFilter.i18n.php
M Views/AbuseFilterViewEdit.php
M special/SpecialAbuseFilter.php
3 files changed, 16 insertions(+), 3 deletions(-)

Approvals:
  Alex Monk: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/AbuseFilter.i18n.php b/AbuseFilter.i18n.php
index 48b6290..950f973 100644
--- a/AbuseFilter.i18n.php
+++ b/AbuseFilter.i18n.php
@@ -230,7 +230,7 @@
        'abusefilter-edit-denied' => "You may not view details of this filter, 
because it is hidden from public view.",
        'abusefilter-edit-main' => 'Filter parameters',
        'abusefilter-edit-done-subtitle' => 'Filter edited',
-       'abusefilter-edit-done' => "You have successfully saved your changes to 
filter $1.",
+       'abusefilter-edit-done' => 
"[[Special:AbuseFilter/history/$1/diff/prev/$2|Your changes]] to 
[[Special:AbuseFilter/$1|filter $1]] have been saved.",
        'abusefilter-edit-badsyntax' => "There is a syntax error in the filter 
you specified.
 The output from the parser was: <pre>$1</pre>",
        'abusefilter-edit-restricted' => 'You cannot edit this filter, because 
it contains one or more restricted actions.
diff --git a/Views/AbuseFilterViewEdit.php b/Views/AbuseFilterViewEdit.php
index c71747e..f1b064a 100644
--- a/Views/AbuseFilterViewEdit.php
+++ b/Views/AbuseFilterViewEdit.php
@@ -268,7 +268,14 @@
                        AbuseFilter::resetFilterProfile( $new_id );
 
                        $out->redirect(
-                               $this->getTitle()->getLocalURL( 
'result=success&changedfilter=' . $new_id ) );
+                               $this->getTitle()->getLocalURL(
+                                       array(
+                                               'result' => 'success',
+                                               'changedfilter' => $new_id,
+                                               'changeid' => $history_id,
+                                       ) 
+                               )
+                       );
                } else {
                        if ( $history_id ) {
                                $out->addWikiMsg(
diff --git a/special/SpecialAbuseFilter.php b/special/SpecialAbuseFilter.php
index 1a77d4c..84f7228 100644
--- a/special/SpecialAbuseFilter.php
+++ b/special/SpecialAbuseFilter.php
@@ -23,8 +23,14 @@
                if ( $request->getVal( 'result' ) == 'success' ) {
                        $out->setSubtitle( $this->msg( 
'abusefilter-edit-done-subtitle' ) );
                        $changedFilter = intval( $request->getVal( 
'changedfilter' ) );
+                       $changeId = intval( $request->getVal( 'changeid' ) );
                        $out->wrapWikiMsg( '<p class="success">$1</p>',
-                               array( 'abusefilter-edit-done', 
$this->getLanguage()->formatNum( $changedFilter ) ) );
+                               array(
+                                       'abusefilter-edit-done',
+                                       $this->getLanguage()->formatNum( 
$changedFilter ),
+                                       $changeId
+                               )
+                       );
                }
 
                $this->mHistoryID = null;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If741756ef398a61ae0fcd809eaee5a040ac8ca3d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Stwalkerster <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Helder.wiki <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot

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

Reply via email to