| Index: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderStartUpModule.php |
| — | — | @@ -79,9 +79,6 @@ |
| 80 | 80 | 'wgDBname' => $wgDBname, |
| 81 | 81 | 'wgExtensionAssetsPath' => $wgExtensionAssetsPath, |
| 82 | 82 | ); |
| 83 | | - if ( $wgContLang->hasVariants() ) { |
| 84 | | - $vars['wgUserVariant'] = $wgContLang->getPreferredVariant(); |
| 85 | | - } |
| 86 | 83 | if ( $wgUseAjax && $wgEnableMWSuggest ) { |
| 87 | 84 | $vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate(); |
| 88 | 85 | } |
| Index: branches/wmf/1.17wmf1/includes/Skin.php |
| — | — | @@ -442,6 +442,9 @@ |
| 443 | 443 | 'wgCategories' => $wgOut->getCategories(), |
| 444 | 444 | 'wgBreakFrames' => $wgOut->getFrameOptions() == 'DENY', |
| 445 | 445 | ); |
| | 446 | + if ( $wgContLang->hasVariants() ) { |
| | 447 | + $vars['wgUserVariant'] = $wgContLang->getPreferredVariant(); |
| | 448 | + } |
| 446 | 449 | foreach ( $wgTitle->getRestrictionTypes() as $type ) { |
| 447 | 450 | $vars['wgRestriction' . ucfirst( $type )] = $wgTitle->getRestrictions( $type ); |
| 448 | 451 | } |