From b3a8888f21e880fc43cc50295d256854409c4ed7 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 24 Oct 2010 07:59:01 +0000 Subject: [PATCH] Removed trailing whitespaces --- includes/specials/SpecialMovepage.php | 34 +++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php index 3f0e6e10e0..ac012690f7 100644 --- a/includes/specials/SpecialMovepage.php +++ b/includes/specials/SpecialMovepage.php @@ -96,9 +96,9 @@ class MovePageForm extends UnlistedSpecialPage { /** * Show the form * - * @param $err Mixed: error message. May either be a string message name or - * array message name and parameters, like the second argument to - * OutputPage::wrapWikiMsg(). + * @param $err Mixed: error message. May either be a string message name or + * array message name and parameters, like the second argument to + * OutputPage::wrapWikiMsg(). */ function showForm( $err ) { global $wgOut, $wgUser, $wgContLang, $wgFixDoubleRedirects; @@ -156,14 +156,14 @@ class MovePageForm extends UnlistedSpecialPage { $submitVar = 'wpMoveOverSharedFile'; $err = ''; } - + $oldTalk = $this->oldTitle->getTalkPage(); $considerTalk = ( !$this->oldTitle->isTalkPage() && $oldTalk->exists() ); $dbr = wfGetDB( DB_SLAVE ); if ( $wgFixDoubleRedirects ) { - $hasRedirects = $dbr->selectField( 'redirect', '1', - array( + $hasRedirects = $dbr->selectField( 'redirect', '1', + array( 'rd_namespace' => $this->oldTitle->getNamespace(), 'rd_title' => $this->oldTitle->getDBkey(), ) , __METHOD__ ); @@ -253,7 +253,7 @@ class MovePageForm extends UnlistedSpecialPage { " . - Xml::checkLabel( wfMsg( 'move-leave-redirect' ), 'wpLeaveRedirect', + Xml::checkLabel( wfMsg( 'move-leave-redirect' ), 'wpLeaveRedirect', 'wpLeaveRedirect', $this->leaveRedirect ) . " " @@ -265,7 +265,7 @@ class MovePageForm extends UnlistedSpecialPage { " . - Xml::checkLabel( wfMsg( 'fix-double-redirects' ), 'wpFixRedirects', + Xml::checkLabel( wfMsg( 'fix-double-redirects' ), 'wpFixRedirects', 'wpFixRedirects', $this->fixRedirects ) . " " @@ -304,7 +304,7 @@ class MovePageForm extends UnlistedSpecialPage { ); } - $watchChecked = $wgUser->isLoggedIn() && ($this->watch || $wgUser->getBoolOption( 'watchmoves' ) + $watchChecked = $wgUser->isLoggedIn() && ($this->watch || $wgUser->getBoolOption( 'watchmoves' ) || $this->oldTitle->userIsWatching()); # Don't allow watching if user is not logged in if( $wgUser->isLoggedIn() ) { @@ -317,7 +317,7 @@ class MovePageForm extends UnlistedSpecialPage { "); } - $wgOut->addHTML( " + $wgOut->addHTML( " {$confirm}   @@ -378,16 +378,16 @@ class MovePageForm extends UnlistedSpecialPage { } # Show a warning if the target file exists on a shared repo - if ( $nt->getNamespace() == NS_FILE + if ( $nt->getNamespace() == NS_FILE && !( $this->moveOverShared && $wgUser->isAllowed( 'reupload-shared' ) ) - && !RepoGroup::singleton()->getLocalRepo()->findFile( $nt ) + && !RepoGroup::singleton()->getLocalRepo()->findFile( $nt ) && wfFindFile( $nt ) ) { $this->showForm( array('file-exists-sharedrepo') ); return; - + } - + if ( $wgUser->isAllowed( 'suppressredirect' ) ) { $createRedirect = $this->leaveRedirect; } else { @@ -443,7 +443,7 @@ class MovePageForm extends UnlistedSpecialPage { # would mean that you couldn't move them back in one operation, which # is bad. FIXME: A specific error message should be given in this # case. - + // FIXME: Use Title::moveSubpages() here $dbr = wfGetDB( DB_MASTER ); if( $this->moveSubpages && ( @@ -557,8 +557,8 @@ class MovePageForm extends UnlistedSpecialPage { $wgUser->removeWatch( $ot ); $wgUser->removeWatch( $nt ); } - - # Re-clear the file redirect cache, which may have been polluted by + + # Re-clear the file redirect cache, which may have been polluted by # parsing in messages above. See CR r56745. # FIXME: needs a more robust solution inside FileRepo. if( $ot->getNamespace() == NS_FILE ) { -- 2.20.1