| Index: trunk/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -570,7 +570,7 @@ |
| 571 | 571 | * @ingroup SpecialPage |
| 572 | 572 | */ |
| 573 | 573 | class SpecialUndelete extends SpecialPage { |
| 574 | | - var $mAction, $mTarget, $mTimestamp, $mRestore, $mInvert, $mFile; |
| | 574 | + var $mAction, $mTarget, $mTimestamp, $mRestore, $mInvert, $mFilename; |
| 575 | 575 | var $mTargetTimestamp, $mAllowed, $mCanView, $mComment, $mToken, $mRequest; |
| 576 | 576 | |
| 577 | 577 | /** |
| — | — | @@ -596,7 +596,7 @@ |
| 597 | 597 | $this->mSearchPrefix = $this->mRequest->getText( 'prefix' ); |
| 598 | 598 | $time = $this->mRequest->getVal( 'timestamp' ); |
| 599 | 599 | $this->mTimestamp = $time ? wfTimestamp( TS_MW, $time ) : ''; |
| 600 | | - $this->mFile = $this->mRequest->getVal( 'file' ); |
| | 600 | + $this->mFilename = $this->mRequest->getVal( 'file' ); |
| 601 | 601 | |
| 602 | 602 | $posted = $this->mRequest->wasPosted() && |
| 603 | 603 | $wgUser->matchEditToken( $this->mRequest->getVal( 'wpEditToken' ) ); |
| — | — | @@ -685,11 +685,11 @@ |
| 686 | 686 | if( $this->mTimestamp !== '' ) { |
| 687 | 687 | return $this->showRevision( $this->mTimestamp ); |
| 688 | 688 | } |
| 689 | | - if( $this->mFile !== null ) { |
| 690 | | - $file = new ArchivedFile( $this->mTargetObj, '', $this->mFile ); |
| | 689 | + if( $this->mFilename !== null ) { |
| | 690 | + $file = new ArchivedFile( $this->mTargetObj, '', $this->mFilename ); |
| 691 | 691 | // Check if user is allowed to see this file |
| 692 | 692 | if ( !$file->exists() ) { |
| 693 | | - $wgOut->addWikiMsg( 'filedelete-nofile', $this->mFile ); |
| | 693 | + $wgOut->addWikiMsg( 'filedelete-nofile', $this->mFilename ); |
| 694 | 694 | return; |
| 695 | 695 | } else if( !$file->userCan( File::DELETED_FILE ) ) { |
| 696 | 696 | if( $file->isDeleted( File::DELETED_RESTRICTED ) ) { |
| — | — | @@ -698,11 +698,11 @@ |
| 699 | 699 | $wgOut->permissionRequired( 'deletedtext' ); |
| 700 | 700 | } |
| 701 | 701 | return false; |
| 702 | | - } elseif ( !$wgUser->matchEditToken( $this->mToken, $this->mFile ) ) { |
| 703 | | - $this->showFileConfirmationForm( $this->mFile ); |
| | 702 | + } elseif ( !$wgUser->matchEditToken( $this->mToken, $this->mFilename ) ) { |
| | 703 | + $this->showFileConfirmationForm( $this->mFilename ); |
| 704 | 704 | return false; |
| 705 | 705 | } else { |
| 706 | | - return $this->showFile( $this->mFile ); |
| | 706 | + return $this->showFile( $this->mFilename ); |
| 707 | 707 | } |
| 708 | 708 | } |
| 709 | 709 | if( $this->mRestore && $this->mAction == 'submit' ) { |
| — | — | @@ -1024,7 +1024,7 @@ |
| 1025 | 1025 | */ |
| 1026 | 1026 | private function showFileConfirmationForm( $key ) { |
| 1027 | 1027 | global $wgOut, $wgUser, $wgLang; |
| 1028 | | - $file = new ArchivedFile( $this->mTargetObj, '', $this->mFile ); |
| | 1028 | + $file = new ArchivedFile( $this->mTargetObj, '', $this->mFilename ); |
| 1029 | 1029 | $wgOut->addWikiMsg( 'undelete-show-file-confirm', |
| 1030 | 1030 | $this->mTargetObj->getText(), |
| 1031 | 1031 | $wgLang->date( $file->getTimestamp() ), |