| Index: trunk/phase3/includes/resourceloader/ResourceLoaderStartUpModule.php |
| — | — | @@ -87,9 +87,6 @@ |
| 88 | 88 | 'wgAvailableSkins' => Skin::getSkinNames(), |
| 89 | 89 | 'wgExtensionAssetsPath' => $wgExtensionAssetsPath, |
| 90 | 90 | ); |
| 91 | | - if ( $wgContLang->hasVariants() ) { |
| 92 | | - $vars['wgUserVariant'] = $wgContLang->getPreferredVariant(); |
| 93 | | - } |
| 94 | 91 | if ( $wgUseAjax && $wgEnableMWSuggest ) { |
| 95 | 92 | $vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate(); |
| 96 | 93 | } |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -500,6 +500,9 @@ |
| 501 | 501 | 'wgCategories' => $wgOut->getCategories(), |
| 502 | 502 | 'wgBreakFrames' => $wgOut->getFrameOptions() == 'DENY', |
| 503 | 503 | ); |
| | 504 | + if ( $wgContLang->hasVariants() ) { |
| | 505 | + $vars['wgUserVariant'] = $wgContLang->getPreferredVariant(); |
| | 506 | + } |
| 504 | 507 | foreach ( $wgTitle->getRestrictionTypes() as $type ) { |
| 505 | 508 | $vars['wgRestriction' . ucfirst( $type )] = $wgTitle->getRestrictions( $type ); |
| 506 | 509 | } |