From fde4d6ef8df9a5b20bab24ff562b1e0975127bfb Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Tue, 23 Aug 2011 19:48:18 +0000 Subject: [PATCH] Use local context instead of global variables --- includes/specials/SpecialFilepath.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/includes/specials/SpecialFilepath.php b/includes/specials/SpecialFilepath.php index bcf696585a..3effa52044 100644 --- a/includes/specials/SpecialFilepath.php +++ b/includes/specials/SpecialFilepath.php @@ -33,12 +33,11 @@ class SpecialFilepath extends SpecialPage { } function execute( $par ) { - global $wgRequest, $wgOut; - $this->setHeaders(); $this->outputHeader(); - $file = !is_null( $par ) ? $par : $wgRequest->getText( 'file' ); + $request = $this->getRequest(); + $file = !is_null( $par ) ? $par : $request->getText( 'file' ); $title = Title::makeTitleSafe( NS_FILE, $file ); @@ -50,8 +49,8 @@ class SpecialFilepath extends SpecialPage { if ( $file && $file->exists() ) { // Default behaviour: Use the direct link to the file. $url = $file->getURL(); - $width = $wgRequest->getInt( 'width', -1 ); - $height = $wgRequest->getInt( 'height', -1 ); + $width = $request->getInt( 'width', -1 ); + $height = $request->getInt( 'height', -1 ); // If a width is requested... if ( $width != -1 ) { @@ -62,9 +61,9 @@ class SpecialFilepath extends SpecialPage { $url = $mto->getURL(); } } - $wgOut->redirect( $url ); + $this->getOutput()->redirect( $url ); } else { - $wgOut->setStatusCode( 404 ); + $this->getOutput()->setStatusCode( 404 ); $this->showForm( $title ); } } @@ -74,9 +73,9 @@ class SpecialFilepath extends SpecialPage { * @param $title Title */ function showForm( $title ) { - global $wgOut, $wgScript; + global $wgScript; - $wgOut->addHTML( + $this->getOutput()->addHTML( Html::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript, 'id' => 'specialfilepath' ) ) . Html::openElement( 'fieldset' ) . Html::element( 'legend', null, wfMsg( 'filepath' ) ) . -- 2.20.1