| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -49,11 +49,12 @@ |
| 50 | 50 | * main() |
| 51 | 51 | */ |
| 52 | 52 | public function execute( $par ) { |
| 53 | | - global $wgOut, $wgSpecialVersionShowHooks, $wgRequest; |
| | 53 | + global $wgSpecialVersionShowHooks; |
| 54 | 54 | |
| 55 | 55 | $this->setHeaders(); |
| 56 | 56 | $this->outputHeader(); |
| 57 | | - $wgOut->allowClickjacking(); |
| | 57 | + $out = $this->getOutput(); |
| | 58 | + $out->allowClickjacking(); |
| 58 | 59 | |
| 59 | 60 | $text = |
| 60 | 61 | $this->getMediaWikiCredits() . |
| — | — | @@ -63,10 +64,10 @@ |
| 64 | 65 | $text .= $this->getWgHooks(); |
| 65 | 66 | } |
| 66 | 67 | |
| 67 | | - $wgOut->addWikiText( $text ); |
| 68 | | - $wgOut->addHTML( $this->IPInfo() ); |
| | 68 | + $out->addWikiText( $text ); |
| | 69 | + $out->addHTML( $this->IPInfo() ); |
| 69 | 70 | |
| 70 | | - if ( $wgRequest->getVal( 'easteregg' ) ) { |
| | 71 | + if ( $this->getRequest()->getVal( 'easteregg' ) ) { |
| 71 | 72 | if ( $this->showEasterEgg() ) { |
| 72 | 73 | // TODO: put something interesting here |
| 73 | 74 | } |
| — | — | @@ -357,11 +358,10 @@ |
| 358 | 359 | * Callback to sort extensions by type. |
| 359 | 360 | */ |
| 360 | 361 | function compare( $a, $b ) { |
| 361 | | - global $wgLang; |
| 362 | 362 | if( $a['name'] === $b['name'] ) { |
| 363 | 363 | return 0; |
| 364 | 364 | } else { |
| 365 | | - return $wgLang->lc( $a['name'] ) > $wgLang->lc( $b['name'] ) |
| | 365 | + return $this->getLang()->lc( $a['name'] ) > $this->getLang()->lc( $b['name'] ) |
| 366 | 366 | ? 1 |
| 367 | 367 | : -1; |
| 368 | 368 | } |
| — | — | @@ -542,11 +542,10 @@ |
| 543 | 543 | } elseif ( $cnt == 0 ) { |
| 544 | 544 | return ''; |
| 545 | 545 | } else { |
| 546 | | - global $wgLang; |
| 547 | 546 | if ( $sort ) { |
| 548 | 547 | sort( $list ); |
| 549 | 548 | } |
| 550 | | - return $wgLang->listToText( array_map( array( __CLASS__, 'arrayToString' ), $list ) ); |
| | 549 | + return $this->getLang()->listToText( array_map( array( __CLASS__, 'arrayToString' ), $list ) ); |
| 551 | 550 | } |
| 552 | 551 | } |
| 553 | 552 | |