From 8dcb5a5cf795ceee5d281b1d3ccebe463a194043 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Tue, 12 Jul 2011 12:35:06 +0000 Subject: [PATCH] Use the local context instead of global variables --- includes/specials/SpecialBooksources.php | 27 ++++++++++++------------ 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/includes/specials/SpecialBooksources.php b/includes/specials/SpecialBooksources.php index 33defedb85..208193299d 100644 --- a/includes/specials/SpecialBooksources.php +++ b/includes/specials/SpecialBooksources.php @@ -49,14 +49,13 @@ class SpecialBookSources extends SpecialPage { * @param $isbn ISBN passed as a subpage parameter */ public function execute( $isbn ) { - global $wgOut, $wgRequest; $this->setHeaders(); - $this->isbn = self::cleanIsbn( $isbn ? $isbn : $wgRequest->getText( 'isbn' ) ); - $wgOut->addWikiMsg( 'booksources-summary' ); - $wgOut->addHTML( $this->makeForm() ); + $this->outputHeader(); + $this->isbn = self::cleanIsbn( $isbn ? $isbn : $this->getRequest()->getText( 'isbn' ) ); + $this->getOutput()->addHTML( $this->makeForm() ); if( strlen( $this->isbn ) > 0 ) { if( !self::isValidISBN( $this->isbn ) ) { - $wgOut->wrapWikiMsg( "
\n$1\n
", 'booksources-invalid-isbn' ); + $this->getOutput()->wrapWikiMsg( "
\n$1\n
", 'booksources-invalid-isbn' ); } $this->showList(); } @@ -115,10 +114,10 @@ class SpecialBookSources extends SpecialPage { */ private function makeForm() { global $wgScript; - $title = self::getTitleFor( 'Booksources' ); + $form = '
' . wfMsgHtml( 'booksources-search-legend' ) . ''; $form .= Xml::openElement( 'form', array( 'method' => 'get', 'action' => $wgScript ) ); - $form .= Html::hidden( 'title', $title->getPrefixedText() ); + $form .= Html::hidden( 'title', $this->getTitle()->getPrefixedText() ); $form .= '

' . Xml::inputLabel( wfMsg( 'booksources-isbn' ), 'isbn', 'isbn', 20, $this->isbn ); $form .= ' ' . Xml::submitButton( wfMsg( 'booksources-go' ) ) . '

'; $form .= Xml::closeElement( 'form' ); @@ -133,27 +132,27 @@ class SpecialBookSources extends SpecialPage { * @return string */ private function showList() { - global $wgOut, $wgContLang; + global $wgContLang; # Hook to allow extensions to insert additional HTML, # e.g. for API-interacting plugins and so on - wfRunHooks( 'BookInformation', array( $this->isbn, &$wgOut ) ); + wfRunHooks( 'BookInformation', array( $this->isbn, $this->getOutput() ) ); # Check for a local page such as Project:Book_sources and use that if available $title = Title::makeTitleSafe( NS_PROJECT, wfMsgForContent( 'booksources' ) ); # Show list in content language if( is_object( $title ) && $title->exists() ) { $rev = Revision::newFromTitle( $title ); - $wgOut->addWikiText( str_replace( 'MAGICNUMBER', $this->isbn, $rev->getText() ) ); + $this->getOutput()->addWikiText( str_replace( 'MAGICNUMBER', $this->isbn, $rev->getText() ) ); return true; } # Fall back to the defaults given in the language file - $wgOut->addWikiMsg( 'booksources-text' ); - $wgOut->addHTML( '' ); return true; } -- 2.20.1