From a149382a2d0f4de52cc7bc880b224ec19efccae9 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Sun, 3 Aug 2014 17:37:38 -0700 Subject: [PATCH] SpecialResetTokens: Use Config instead of globals Change-Id: Iab521a681751e70c369ebf90c8ef4dab4a5d9d4a --- includes/specials/SpecialResetTokens.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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; -- 2.20.1