From: Kunal Mehta <legoktm@gmail.com>
Date: Mon, 4 Aug 2014 00:37:38 +0000 (-0700)
Subject: SpecialResetTokens: Use Config instead of globals
X-Git-Tag: 1.31.0-rc.0~14595^2
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=a149382a2d0f4de52cc7bc880b224ec19efccae9;p=lhc%2Fweb%2Fwiklou.git

SpecialResetTokens: Use Config instead of globals

Change-Id: Iab521a681751e70c369ebf90c8ef4dab4a5d9d4a
---

diff --git a/includes/specials/SpecialResetTokens.php b/includes/specials/SpecialResetTokens.php
index 864485ce5c..bc1326bd5b 100644
--- a/includes/specials/SpecialResetTokens.php
+++ b/includes/specials/SpecialResetTokens.php
@@ -40,16 +40,15 @@ class SpecialResetTokens extends FormSpecialPage {
 	 * @return array
 	 */
 	protected function getTokensList() {
-		global $wgHiddenPrefs;
-
 		if ( !isset( $this->tokensList ) ) {
 			$tokens = array(
 				array( 'preference' => 'watchlisttoken', 'label-message' => 'resettokens-watchlist-token' ),
 			);
 			wfRunHooks( 'SpecialResetTokensTokens', array( &$tokens ) );
 
-			$tokens = array_filter( $tokens, function ( $tok ) use ( $wgHiddenPrefs ) {
-				return !in_array( $tok['preference'], $wgHiddenPrefs );
+			$hiddenPrefs = $this->getConfig()->get( 'HiddenPrefs' );
+			$tokens = array_filter( $tokens, function ( $tok ) use ( $hiddenPrefs ) {
+				return !in_array( $tok['preference'], $hiddenPrefs );
 			} );
 
 			$this->tokensList = $tokens;