| Index: trunk/phase3/includes/FileDeleteForm.php |
| — | — | @@ -63,7 +63,7 @@ |
| 64 | 64 | |
| 65 | 65 | // Perform the deletion if appropriate |
| 66 | 66 | if( $wgRequest->wasPosted() && $wgUser->matchEditToken( $token, $this->oldimage ) ) { |
| 67 | | - $comment = $wgRequest->getText( 'wpComment' ); |
| | 67 | + $comment = $wgRequest->getText( 'wpReason' ); |
| 68 | 68 | if( $this->oldimage ) { |
| 69 | 69 | $status = $this->file->deleteOld( $this->oldimage, $comment ); |
| 70 | 70 | if( $status->ok ) { |
| — | — | @@ -98,14 +98,15 @@ |
| 99 | 99 | * Show the confirmation form |
| 100 | 100 | */ |
| 101 | 101 | private function showForm() { |
| 102 | | - global $wgOut, $wgUser; |
| | 102 | + global $wgOut, $wgUser, $wgRequest; |
| 103 | 103 | |
| 104 | 104 | $form = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getAction() ) ); |
| 105 | 105 | $form .= Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ); |
| 106 | 106 | $form .= '<fieldset><legend>' . wfMsgHtml( 'filedelete-legend' ) . '</legend>'; |
| 107 | 107 | $form .= $this->prepareMessage( 'filedelete-intro' ); |
| 108 | 108 | |
| 109 | | - $form .= '<p>' . Xml::inputLabel( wfMsg( 'filedelete-comment' ), 'wpComment', 'wpComment', 60 ) . '</p>'; |
| | 109 | + $form .= '<p>' . Xml::inputLabel( wfMsg( 'filedelete-comment' ), 'wpReason', 'wpReason', |
| | 110 | + 60, $wgRequest->getText( 'wpReason' ) ) . '</p>'; |
| 110 | 111 | $form .= '<p>' . Xml::submitButton( wfMsg( 'filedelete-submit' ) ) . '</p>'; |
| 111 | 112 | $form .= '</fieldset>'; |
| 112 | 113 | $form .= '</form>'; |