| Index: branches/wmf/1.17wmf1/includes/Skin.php |
| — | — | @@ -422,7 +422,7 @@ |
| 423 | 423 | * You will only be adding bloat to the page and causing page caches to have to be purged on configuration changes. |
| 424 | 424 | */ |
| 425 | 425 | static function makeGlobalVariablesScript( $skinName ) { |
| 426 | | - global $wgTitle, $wgUser, $wgRequest, $wgArticle, $wgOut, $wgRestrictionTypes, $wgUseAjax, $wgEnableMWSuggest; |
| | 426 | + global $wgTitle, $wgUser, $wgRequest, $wgArticle, $wgOut, $wgRestrictionTypes, $wgUseAjax, $wgEnableMWSuggest, $wgContLang; |
| 427 | 427 | |
| 428 | 428 | $ns = $wgTitle->getNamespace(); |
| 429 | 429 | $nsname = MWNamespace::exists( $ns ) ? MWNamespace::getCanonicalName( $ns ) : $wgTitle->getNsText(); |
| Property changes on: branches/wmf/1.17wmf1/includes/Skin.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 430 | 430 | Merged /branches/REL1_15/phase3/includes/Skin.php:r51646 |
| 431 | 431 | Merged /branches/wmf/1.16wmf4/includes/Skin.php:r67177,69199,76243,77266 |
| 432 | 432 | Merged /branches/sqlite/includes/Skin.php:r58211-58321 |
| 433 | 433 | Merged /trunk/phase3/includes/Skin.php:r82263 |
| 434 | 434 | Merged /branches/new-installer/phase3/includes/Skin.php:r43664-66004 |
| 435 | 435 | Merged /branches/wmf-deployment/includes/Skin.php:r53381,60970 |