| Index: trunk/phase3/includes/specials/SpecialMovepage.php |
| — | — | @@ -96,9 +96,9 @@ |
| 97 | 97 | /** |
| 98 | 98 | * Show the form |
| 99 | 99 | * |
| 100 | | - * @param $err Mixed: error message. May either be a string message name or |
| 101 | | - * array message name and parameters, like the second argument to |
| 102 | | - * OutputPage::wrapWikiMsg(). |
| | 100 | + * @param $err Mixed: error message. May either be a string message name or |
| | 101 | + * array message name and parameters, like the second argument to |
| | 102 | + * OutputPage::wrapWikiMsg(). |
| 103 | 103 | */ |
| 104 | 104 | function showForm( $err ) { |
| 105 | 105 | global $wgOut, $wgUser, $wgContLang, $wgFixDoubleRedirects; |
| — | — | @@ -156,14 +156,14 @@ |
| 157 | 157 | $submitVar = 'wpMoveOverSharedFile'; |
| 158 | 158 | $err = ''; |
| 159 | 159 | } |
| 160 | | - |
| | 160 | + |
| 161 | 161 | $oldTalk = $this->oldTitle->getTalkPage(); |
| 162 | 162 | $considerTalk = ( !$this->oldTitle->isTalkPage() && $oldTalk->exists() ); |
| 163 | 163 | |
| 164 | 164 | $dbr = wfGetDB( DB_SLAVE ); |
| 165 | 165 | if ( $wgFixDoubleRedirects ) { |
| 166 | | - $hasRedirects = $dbr->selectField( 'redirect', '1', |
| 167 | | - array( |
| | 166 | + $hasRedirects = $dbr->selectField( 'redirect', '1', |
| | 167 | + array( |
| 168 | 168 | 'rd_namespace' => $this->oldTitle->getNamespace(), |
| 169 | 169 | 'rd_title' => $this->oldTitle->getDBkey(), |
| 170 | 170 | ) , __METHOD__ ); |
| — | — | @@ -253,7 +253,7 @@ |
| 254 | 254 | <tr> |
| 255 | 255 | <td></td> |
| 256 | 256 | <td class='mw-input' >" . |
| 257 | | - Xml::checkLabel( wfMsg( 'move-leave-redirect' ), 'wpLeaveRedirect', |
| | 257 | + Xml::checkLabel( wfMsg( 'move-leave-redirect' ), 'wpLeaveRedirect', |
| 258 | 258 | 'wpLeaveRedirect', $this->leaveRedirect ) . |
| 259 | 259 | "</td> |
| 260 | 260 | </tr>" |
| — | — | @@ -265,7 +265,7 @@ |
| 266 | 266 | <tr> |
| 267 | 267 | <td></td> |
| 268 | 268 | <td class='mw-input' >" . |
| 269 | | - Xml::checkLabel( wfMsg( 'fix-double-redirects' ), 'wpFixRedirects', |
| | 269 | + Xml::checkLabel( wfMsg( 'fix-double-redirects' ), 'wpFixRedirects', |
| 270 | 270 | 'wpFixRedirects', $this->fixRedirects ) . |
| 271 | 271 | "</td> |
| 272 | 272 | </tr>" |
| — | — | @@ -304,7 +304,7 @@ |
| 305 | 305 | ); |
| 306 | 306 | } |
| 307 | 307 | |
| 308 | | - $watchChecked = $wgUser->isLoggedIn() && ($this->watch || $wgUser->getBoolOption( 'watchmoves' ) |
| | 308 | + $watchChecked = $wgUser->isLoggedIn() && ($this->watch || $wgUser->getBoolOption( 'watchmoves' ) |
| 309 | 309 | || $this->oldTitle->userIsWatching()); |
| 310 | 310 | # Don't allow watching if user is not logged in |
| 311 | 311 | if( $wgUser->isLoggedIn() ) { |
| — | — | @@ -317,7 +317,7 @@ |
| 318 | 318 | </tr>"); |
| 319 | 319 | } |
| 320 | 320 | |
| 321 | | - $wgOut->addHTML( " |
| | 321 | + $wgOut->addHTML( " |
| 322 | 322 | {$confirm} |
| 323 | 323 | <tr> |
| 324 | 324 | <td> </td> |
| — | — | @@ -378,16 +378,16 @@ |
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | # Show a warning if the target file exists on a shared repo |
| 382 | | - if ( $nt->getNamespace() == NS_FILE |
| | 382 | + if ( $nt->getNamespace() == NS_FILE |
| 383 | 383 | && !( $this->moveOverShared && $wgUser->isAllowed( 'reupload-shared' ) ) |
| 384 | | - && !RepoGroup::singleton()->getLocalRepo()->findFile( $nt ) |
| | 384 | + && !RepoGroup::singleton()->getLocalRepo()->findFile( $nt ) |
| 385 | 385 | && wfFindFile( $nt ) ) |
| 386 | 386 | { |
| 387 | 387 | $this->showForm( array('file-exists-sharedrepo') ); |
| 388 | 388 | return; |
| 389 | | - |
| | 389 | + |
| 390 | 390 | } |
| 391 | | - |
| | 391 | + |
| 392 | 392 | if ( $wgUser->isAllowed( 'suppressredirect' ) ) { |
| 393 | 393 | $createRedirect = $this->leaveRedirect; |
| 394 | 394 | } else { |
| — | — | @@ -443,7 +443,7 @@ |
| 444 | 444 | # would mean that you couldn't move them back in one operation, which |
| 445 | 445 | # is bad. FIXME: A specific error message should be given in this |
| 446 | 446 | # case. |
| 447 | | - |
| | 447 | + |
| 448 | 448 | // FIXME: Use Title::moveSubpages() here |
| 449 | 449 | $dbr = wfGetDB( DB_MASTER ); |
| 450 | 450 | if( $this->moveSubpages && ( |
| — | — | @@ -557,8 +557,8 @@ |
| 558 | 558 | $wgUser->removeWatch( $ot ); |
| 559 | 559 | $wgUser->removeWatch( $nt ); |
| 560 | 560 | } |
| 561 | | - |
| 562 | | - # Re-clear the file redirect cache, which may have been polluted by |
| | 561 | + |
| | 562 | + # Re-clear the file redirect cache, which may have been polluted by |
| 563 | 563 | # parsing in messages above. See CR r56745. |
| 564 | 564 | # FIXME: needs a more robust solution inside FileRepo. |
| 565 | 565 | if( $ot->getNamespace() == NS_FILE ) { |