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

Change subject: Use whitelist instead of blacklist for translate tab group
......................................................................


Use whitelist instead of blacklist for translate tab group

Change-Id: I3a5fa70d92562829d8940159fe5369cb0ceeff01
---
M specials/SpecialTranslate.php
1 file changed, 4 insertions(+), 14 deletions(-)

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



diff --git a/specials/SpecialTranslate.php b/specials/SpecialTranslate.php
index 1a81b85..b19f0b1 100644
--- a/specials/SpecialTranslate.php
+++ b/specials/SpecialTranslate.php
@@ -838,8 +838,8 @@
 
                $request = $skin->getRequest();
                // However, query string params take precedence
-               $params = $request->getQueryValues() + $params;
-               asort( $params );
+               $params['language'] = $request->getVal( 'language' );
+               $params['group'] = $request->getVal( 'group' );
 
                $taction = $request->getVal( 'taction', 'translate' );
 
@@ -847,32 +847,22 @@
                $languagestats = SpecialPage::getTitleFor( 'LanguageStats' );
                $messagegroupstats = SpecialPage::getTitleFor( 
'MessageGroupStats' );
 
-               unset( $params['task'] ); // Depends on taction
-               unset( $params['taction'] ); // We're supplying this ourself
-               unset( $params['title'] ); // As above
-               unset( $params['x'] ); // Was posted -marker on stats pages
-               unset( $params['suppresscomplete'] ); // Stats things, should
-               unset( $params['suppressempty'] ); // not be passed
-
                // Clear the special page tab that might be there already
                $tabs['namespaces'] = array();
 
-               $tabs['namespaces']['translate'] = $data = array(
+               $tabs['namespaces']['translate'] = array(
                        'text' => wfMessage( 'translate-taction-translate' 
)->text(),
                        'href' => $translate->getLocalUrl( array( 'taction' => 
'translate' ) + $params ),
                        'class' => $alias === 'Translate' && $taction === 
'translate' ? 'selected' : '',
                );
 
                if ( !self::isBeta( $request ) ) {
-                       $tabs['namespaces']['proofread'] = $data = array(
+                       $tabs['namespaces']['proofread'] = array(
                                'text' => wfMessage( 
'translate-taction-proofread' )->text(),
                                'href' => $translate->getLocalUrl( array( 
'taction' => 'proofread' ) + $params ),
                                'class' => $alias === 'Translate' && $taction 
=== 'proofread' ? 'selected' : '',
                        );
                }
-
-               // Limit only applies to the above
-               unset( $params['limit'] );
 
                $tabs['views']['lstats'] = array(
                        'text' => wfMessage( 'translate-taction-lstats' 
)->text(),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a5fa70d92562829d8940159fe5369cb0ceeff01
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[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