Matmarex has uploaded a new change for review.

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


Change subject: (bug 25325) fix wlexcludeuser for ApiFeedWatchlist
......................................................................

(bug 25325) fix wlexcludeuser for ApiFeedWatchlist

The effect of setting this option was later overwritten in the code; I
just moved an if a few lines down.

Change-Id: I2a85673330681c6ff7facc25a7bbfb6972fe8fd5
---
M includes/api/ApiFeedWatchlist.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/49/53049/1

diff --git a/includes/api/ApiFeedWatchlist.php 
b/includes/api/ApiFeedWatchlist.php
index a3b4682..1792c88 100644
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -61,9 +61,6 @@
                        if( !isset( $wgFeedClasses[$params['feedformat']] ) ) {
                                $this->dieUsage( 'Invalid subscription feed 
type', 'feed-invalid' );
                        }
-                       if ( !is_null( $params['wlexcludeuser'] ) ) {
-                               $fauxReqArr['wlexcludeuser'] = 
$params['wlexcludeuser'];
-                       }
 
                        // limit to the number of hours going from now back
                        $endTime = wfTimestamp( TS_MW, time() - intval( 
$params['hours'] * 60 * 60 ) );
@@ -86,6 +83,9 @@
                        if ( !is_null( $params['wltoken'] ) ) {
                                $fauxReqArr['wltoken'] = $params['wltoken'];
                        }
+                       if ( !is_null( $params['wlexcludeuser'] ) ) {
+                               $fauxReqArr['wlexcludeuser'] = 
$params['wlexcludeuser'];
+                       }
 
                        // Support linking to diffs instead of article
                        if ( $params['linktodiffs'] ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a85673330681c6ff7facc25a7bbfb6972fe8fd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Matmarex <[email protected]>

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

Reply via email to