| Index: branches/wmf/1.19wmf1/includes/OutputPage.php |
| — | — | @@ -2829,7 +2829,7 @@ |
| 2830 | 2830 | * @return array |
| 2831 | 2831 | */ |
| 2832 | 2832 | public function getJSVars() { |
| 2833 | | - global $wgUseAjax, $wgEnableMWSuggest; |
| | 2833 | + global $wgUseAjax, $wgEnableMWSuggest, $wgContLang; |
| 2834 | 2834 | |
| 2835 | 2835 | $latestRevID = 0; |
| 2836 | 2836 | $pageID = 0; |
| — | — | @@ -2881,8 +2881,8 @@ |
| 2882 | 2882 | 'wgSeparatorTransformTable' => $compactSeparatorTransTable, |
| 2883 | 2883 | 'wgDigitTransformTable' => $compactDigitTransTable, |
| 2884 | 2884 | ); |
| 2885 | | - if ( $lang->hasVariants() ) { |
| 2886 | | - $vars['wgUserVariant'] = $lang->getPreferredVariant(); |
| | 2885 | + if ( $wgContLang->hasVariants() ) { |
| | 2886 | + $vars['wgUserVariant'] = $wgContLang->getPreferredVariant(); |
| 2887 | 2887 | } |
| 2888 | 2888 | foreach ( $title->getRestrictionTypes() as $type ) { |
| 2889 | 2889 | $vars['wgRestriction' . ucfirst( $type )] = $title->getRestrictions( $type ); |
| Property changes on: branches/wmf/1.19wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2890 | 2890 | Merged /trunk/phase3/includes/OutputPage.php:r113127 |