r85401 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r85400‎ | r85401 | r85402 >
Date:23:56, 4 April 2011
Author:reedy
Status:ok
Tags:
Comment:
Tidy up a few unused/doubley declared globals
Modified paths:
  • /branches/REL1_17/phase3/includes/Skin.php (modified) (history)
  • /branches/REL1_17/phase3/includes/api/ApiParse.php (modified) (history)
  • /branches/REL1_17/phase3/includes/specials/SpecialImport.php (modified) (history)
  • /branches/REL1_17/phase3/includes/specials/SpecialUploadStash.php (modified) (history)
  • /branches/REL1_17/phase3/includes/upload/UploadBase.php (modified) (history)

Diff [purge]

Index: branches/REL1_17/phase3/includes/upload/UploadBase.php
@@ -627,7 +627,7 @@
628628 * @return File: stashed file
629629 */
630630 public function stashSessionFile( $key = null ) {
631 - $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash();;
 631+ $stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash();
632632 $data = array(
633633 'mFileProps' => $this->mFileProps
634634 );
Index: branches/REL1_17/phase3/includes/api/ApiParse.php
@@ -65,7 +65,7 @@
6666
6767 // The parser needs $wgTitle to be set, apparently the
6868 // $title parameter in Parser::parse isn't enough *sigh*
69 - global $wgParser, $wgUser, $wgTitle, $wgEnableParserCache, $wgLang;
 69+ global $wgParser, $wgUser, $wgTitle, $wgLang;
7070
7171 // Currently unnecessary, code to act as a safeguard against any change in current behaviour of uselang breaks
7272 $oldLang = null;
Index: branches/REL1_17/phase3/includes/specials/SpecialImport.php
@@ -57,7 +57,6 @@
5858 $this->outputHeader();
5959
6060 if ( wfReadOnly() ) {
61 - global $wgOut;
6261 $wgOut->readOnlyPage();
6362 return;
6463 }
Index: branches/REL1_17/phase3/includes/specials/SpecialUploadStash.php
@@ -56,7 +56,7 @@
5757 * @return Boolean: success
5858 */
5959 public function execute( $subPage ) {
60 - global $wgOut, $wgUser;
 60+ global $wgUser;
6161
6262 if ( !$this->userCanExecute( $wgUser ) ) {
6363 $this->displayRestrictionError();
Index: branches/REL1_17/phase3/includes/Skin.php
@@ -422,7 +422,7 @@
423423 * You will only be adding bloat to the page and causing page caches to have to be purged on configuration changes.
424424 */
425425 static function makeGlobalVariablesScript( $skinName ) {
426 - global $wgTitle, $wgUser, $wgRequest, $wgArticle, $wgOut, $wgRestrictionTypes, $wgUseAjax, $wgEnableMWSuggest;
 426+ global $wgTitle, $wgUser, $wgRequest, $wgArticle, $wgOut, $wgUseAjax, $wgEnableMWSuggest;
427427
428428 $ns = $wgTitle->getNamespace();
429429 $nsname = MWNamespace::exists( $ns ) ? MWNamespace::getCanonicalName( $ns ) : $wgTitle->getNsText();

Status & tagging log