Followup r87340: Post-hook swap bodytext into a new bodycontent key and append printf...

[lhc/web/wiklou.git] / includes / FileDeleteForm.php

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 6d24cf7..e2c95c2 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -37,7 +37,7 @@ class FileDeleteForm {
                        return;
                }
                $permission_errors = $this->title->getUserPermissionsErrors('delete', $wgUser);
-               if (count($permission_errors)>0) {
+               if ( count( $permission_errors ) > 0 ) {
                        $wgOut->showPermissionsErrorPage( $permission_errors );
                        return;
                }
@@ -74,8 +74,12 @@ class FileDeleteForm {
 
                        $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress );
 
-                       if( !$status->isGood() )
+                       if( !$status->isGood() ) {
+                               $wgOut->addHTML( '<h2>' . $this->prepareMessage( 'filedeleteerror-short' ) . "</h2>\n" );
+                               $wgOut->addHTML( '<span class="error">' );
                                $wgOut->addWikiText( $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) );
+                               $wgOut->addHTML( '</span>' );
+                       }
                        if( $status->ok ) {
                                $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
                                $wgOut->addHTML( $this->prepareMessage( 'filedelete-success' ) );
@@ -110,41 +114,38 @@ class FileDeleteForm {
                                // Need to do a log item
                                $log = new LogPage( 'delete' );
                                $logComment = wfMsgForContent( 'deletedrevision', $oldimage );
-                               if( trim( $reason ) != '' )
+                               if( trim( $reason ) != '' ) {
                                        $logComment .= wfMsgForContent( 'colon-separator' ) . $reason;
-                                       $log->addEntry( 'delete', $title, $logComment );
+                               }
+                               $log->addEntry( 'delete', $title, $logComment );
                        }
                } else {
-                       $id = $title->getArticleID( GAID_FOR_UPDATE );
+                       $id = $title->getArticleID( Title::GAID_FOR_UPDATE );
                        $article = new Article( $title );
-                       $error = '';
                        $dbw = wfGetDB( DB_MASTER );
                        try {
-                               if( wfRunHooks( 'ArticleDelete', array( &$article, &$wgUser, &$reason, &$error ) ) ) {
-                                       // delete the associated article first
-                                       if( $article->doDeleteArticle( $reason, $suppress, $id, false ) ) {
-                                               global $wgRequest;
-                                               if( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) {
-                                                       $article->doWatch();
-                                               } elseif( $title->userIsWatching() ) {
-                                                       $article->doUnwatch();
-                                               }
-                                               $status = $file->delete( $reason, $suppress );
-                                               if( $status->ok ) {
-                                                       $dbw->commit();
-                                                       wfRunHooks( 'ArticleDeleteComplete', array( &$article, &$wgUser, $reason, $id ) );
-                                               } else {
-                                                       $dbw->rollback();
-                                               }
+                               // delete the associated article first
+                               if( $article->doDeleteArticle( $reason, $suppress, $id, false ) ) {
+                                       global $wgRequest;
+                                       if ( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) {
+                                               WatchAction::doWatch( $title, $wgUser );
+                                       } elseif ( $title->userIsWatching() ) {
+                                               WatchAction::doUnwatch( $title, $wgUser );
+                                       }
+                                       $status = $file->delete( $reason, $suppress );
+                                       if( $status->ok ) {
+                                               $dbw->commit();
+                                       } else {
+                                               $dbw->rollback();
                                        }
                                }
                        } catch ( MWException $e ) {
                                // rollback before returning to prevent UI from displaying incorrect "View or restore N deleted edits?"
-                               //$dbw->rollback();
+                               $dbw->rollback();
                                throw $e;
                        }
                }
-               if( $status->isGood() ) 
+               if( $status->isGood() )
                        wfRunHooks('FileDeleteComplete', array( &$file, &$oldimage, &$article, &$wgUser, &$reason));
 
                return $status;
@@ -173,7 +174,7 @@ class FileDeleteForm {
                        'id' => 'mw-img-deleteconfirm' ) ) .
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', null, wfMsg( 'filedelete-legend' ) ) .
-                       Xml::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) .
+                       Html::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) .
                        $this->prepareMessage( 'filedelete-intro' ) .
                        Xml::openElement( 'table', array( 'id' => 'mw-img-deleteconfirm-table' ) ) .
                        "<tr>
@@ -196,7 +197,7 @@ class FileDeleteForm {
                                "</td>
                        </tr>
                        {$suppress}";
-               if( $wgUser->isLoggedIn() ) {   
+               if( $wgUser->isLoggedIn() ) {
                        $form .= "
                        <tr>
                                <td></td>
@@ -253,19 +254,18 @@ class FileDeleteForm {
        private function prepareMessage( $message ) {
                global $wgLang;
                if( $this->oldimage ) {
-                       $url = $this->file->getArchiveUrl( $this->oldimage );
                        return wfMsgExt(
                                "{$message}-old", # To ensure grep will find them: 'filedelete-intro-old', 'filedelete-nofile-old', 'filedelete-success-old'
                                'parse',
-                               $this->title->getText(),
+                               wfEscapeWikiText( $this->title->getText() ),
                                $wgLang->date( $this->getTimestamp(), true ),
                                $wgLang->time( $this->getTimestamp(), true ),
-                               wfExpandUrl( $this->file->getArchiveUrl( $this->oldimage ) ) );
+                               wfExpandUrl( $this->file->getArchiveUrl( $this->oldimage ), PROTO_CURRENT ) );
                } else {
                        return wfMsgExt(
                                $message,
                                'parse',
-                               $this->title->getText()
+                               wfEscapeWikiText( $this->title->getText() )
                        );
                }
        }