| Index: trunk/phase3/includes/diff/DifferenceInterface.php |
| — | — | @@ -579,7 +579,7 @@ |
| 580 | 580 | * Add style sheets and supporting JS for diff display. |
| 581 | 581 | */ |
| 582 | 582 | function showDiffStyle() { |
| 583 | | - global $wgStylePath, $wgStyleVersion, $wgOut; |
| | 583 | + global $wgOut; |
| 584 | 584 | $wgOut->addModules( 'mediawiki.legacy.diff' ); |
| 585 | 585 | } |
| 586 | 586 | |
| Index: trunk/phase3/includes/MessageCache.php |
| — | — | @@ -750,6 +750,7 @@ |
| 751 | 751 | # Invalidate all local caches |
| 752 | 752 | $this->mMemc->delete( wfMemcKey( 'messages', $code, 'hash' ) ); |
| 753 | 753 | } |
| | 754 | + $this->mLoadedLanguages = array(); |
| 754 | 755 | } |
| 755 | 756 | |
| 756 | 757 | /** |
| — | — | @@ -811,7 +812,7 @@ |
| 812 | 813 | } |
| 813 | 814 | |
| 814 | 815 | public function figureMessage( $key ) { |
| 815 | | - global $wgContLanguageCode, $wgContLang; |
| | 816 | + global $wgContLanguageCode; |
| 816 | 817 | $pieces = explode( '/', $key ); |
| 817 | 818 | if( count( $pieces ) < 2 ) |
| 818 | 819 | return array( $key, $wgContLanguageCode ); |
| Index: trunk/phase3/includes/ResourceLoaderContext.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | /* Methods */ |
| 40 | 40 | |
| 41 | 41 | public function __construct( WebRequest $request, $server ) { |
| 42 | | - global $wgUser, $wgLang, $wgDefaultSkin; |
| | 42 | + global $wgLang, $wgDefaultSkin; |
| 43 | 43 | |
| 44 | 44 | $this->request = $request; |
| 45 | 45 | $this->server = $server; |
| Index: trunk/phase3/includes/HTMLForm.php |
| — | — | @@ -156,7 +156,7 @@ |
| 157 | 157 | static function addJS() { |
| 158 | 158 | if ( self::$jsAdded ) return; |
| 159 | 159 | |
| 160 | | - global $wgOut, $wgStylePath; |
| | 160 | + global $wgOut; |
| 161 | 161 | |
| 162 | 162 | $wgOut->addModules( 'mediawiki.legacy.htmlform' ); |
| 163 | 163 | } |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1565,7 +1565,7 @@ |
| 1566 | 1566 | global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType; |
| 1567 | 1567 | global $wgUseAjax, $wgAjaxWatch; |
| 1568 | 1568 | global $wgEnableMWSuggest, $wgUniversalEditButton; |
| 1569 | | - global $wgArticle, $wgJQueryOnEveryPage; |
| | 1569 | + global $wgArticle; |
| 1570 | 1570 | |
| 1571 | 1571 | if( $this->mDoNothing ) { |
| 1572 | 1572 | return; |
| — | — | @@ -2301,7 +2301,7 @@ |
| 2302 | 2302 | */ |
| 2303 | 2303 | function getHeadScripts( Skin $sk ) { |
| 2304 | 2304 | global $wgUser, $wgRequest, $wgJsMimeType; |
| 2305 | | - global $wgStylePath, $wgStyleVersion, $wgUseSiteJs; |
| | 2305 | + global $wgUseSiteJs; |
| 2306 | 2306 | |
| 2307 | 2307 | // Statup - this will immediately load jquery and mediawiki modules |
| 2308 | 2308 | $scripts = self::makeResourceLoaderLink( $sk, 'startup', 'scripts' ); |
| Index: trunk/phase3/includes/ChangesList.php |
| — | — | @@ -601,7 +601,7 @@ |
| 602 | 602 | * @return String |
| 603 | 603 | */ |
| 604 | 604 | public function beginRecentChangesList() { |
| 605 | | - global $wgStylePath, $wgStyleVersion, $wgOut; |
| | 605 | + global $wgOut; |
| 606 | 606 | $this->rc_cache = array(); |
| 607 | 607 | $this->rcMoveIndex = 0; |
| 608 | 608 | $this->rcCacheIndex = 0; |
| Index: trunk/phase3/includes/specials/SpecialBlockip.php |
| — | — | @@ -195,7 +195,6 @@ |
| 196 | 196 | wfMsgForContent( 'ipbreason-dropdown' ), |
| 197 | 197 | wfMsgForContent( 'ipbreasonotherlist' ), $this->BlockReasonList, 'wpBlockDropDown', 4 ); |
| 198 | 198 | |
| 199 | | - global $wgStylePath, $wgStyleVersion; |
| 200 | 199 | $wgOut->addModules( 'mediawiki.legacy.block' ); |
| 201 | 200 | $wgOut->addHTML( |
| 202 | 201 | Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ), 'id' => 'blockip' ) ) . |