| Index: trunk/extensions/WebFonts/WebFonts.hooks.php |
| — | — | @@ -17,20 +17,7 @@ |
| 18 | 18 | |
| 19 | 19 | return true; // Hooks must return value |
| 20 | 20 | } |
| 21 | | - |
| 22 | | - public static function addConfig( &$vars ) { |
| 23 | | - global $wgUser; |
| 24 | 21 | |
| 25 | | - if ( $wgUser->getOption( 'webfontsDisable' ) ) { |
| 26 | | - wfDebugLog( 'webfonts', 'User disabled WebFonts: ' , true ); |
| 27 | | - // User disabled WebFonts |
| 28 | | - return true; |
| 29 | | - } |
| 30 | | - |
| 31 | | - |
| 32 | | - return true; |
| 33 | | - } |
| 34 | | - |
| 35 | 22 | public static function addVariables( &$vars ) { |
| 36 | 23 | global $wgWebFontsEnabledByDefault, $wgUser; |
| 37 | 24 | |
| Index: trunk/extensions/WebFonts/WebFonts.php |
| — | — | @@ -35,7 +35,6 @@ |
| 36 | 36 | |
| 37 | 37 | $wgHooks['BeforePageDisplay'][] = 'WebFontsHooks::addModules'; |
| 38 | 38 | $wgHooks['GetPreferences'][] = 'WebFontsHooks::addPreference'; |
| 39 | | -$wgHooks['ResourceLoaderGetConfigVars'][] = 'WebFontsHooks::addConfig'; |
| 40 | 39 | $wgHooks['MakeGlobalVariablesScript'][] = 'WebFontsHooks::addVariables'; |
| 41 | 40 | |
| 42 | 41 | $wgWebFontsEnabled = true; |