revert r111028 (attempt to fix bug 34254)

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

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 900b7d9..661edaa 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -39,7 +39,7 @@ class FileDeleteForm {
         * pending authentication, confirmation, etc.
         */
        public function execute() {
-               global $wgOut, $wgRequest, $wgUser;
+               global $wgOut, $wgRequest, $wgUser, $wgUploadMaintenance;
 
                $permissionErrors = $this->title->getUserPermissionsErrors( 'delete', $wgUser );
                if ( count( $permissionErrors ) ) {
@@ -50,6 +50,10 @@ class FileDeleteForm {
                        throw new ReadOnlyError;
                }
 
+               if ( $wgUploadMaintenance ) {
+                       throw new ErrorPageError( 'filedelete-maintenance-title', 'filedelete-maintenance' );
+               }
+
                $this->setHeaders();
 
                $this->oldimage = $wgRequest->getText( 'oldimage', false );
@@ -81,7 +85,7 @@ class FileDeleteForm {
                                $reason = $deleteReasonList;
                        }
 
-                       $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress );
+                       $status = self::doDelete( $this->title, $this->file, $this->oldimage, $reason, $suppress, $wgUser );
 
                        if( !$status->isGood() ) {
                                $wgOut->addHTML( '<h2>' . $this->prepareMessage( 'filedeleteerror-short' ) . "</h2>\n" );
@@ -95,6 +99,12 @@ class FileDeleteForm {
                                // Return to the main page if we just deleted all versions of the
                                // file, otherwise go back to the description page
                                $wgOut->addReturnTo( $this->oldimage ? $this->title : Title::newMainPage() );
+
+                               if ( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) {
+                                       WatchAction::doWatch( $this->title, $wgUser );
+                               } elseif ( $this->title->userIsWatching() ) {
+                                       WatchAction::doUnwatch( $this->title, $wgUser );
+                               }
                        }
                        return;
                }
@@ -107,17 +117,21 @@ class FileDeleteForm {
         * Really delete the file
         *
         * @param $title Title object
-        * @param $file File object
+        * @param File $file: file object
         * @param $oldimage String: archive name
         * @param $reason String: reason of the deletion
         * @param $suppress Boolean: whether to mark all deleted versions as restricted
+        * @param $user User object performing the request
+        * @return bool|Status
         */
-       public static function doDelete( &$title, &$file, &$oldimage, $reason, $suppress ) {
-               global $wgUser;
-               $article = null;
-               $status = Status::newFatal( 'error' );
+       public static function doDelete( &$title, &$file, &$oldimage, $reason, $suppress, User $user = null ) {
+               if ( $user === null ) {
+                       global $wgUser;
+                       $user = $wgUser;
+               }
 
                if( $oldimage ) {
+                       $page = null;
                        $status = $file->deleteOld( $oldimage, $reason, $suppress );
                        if( $status->ok ) {
                                // Need to do a log item
@@ -129,20 +143,17 @@ class FileDeleteForm {
                                $log->addEntry( 'delete', $title, $logComment );
                        }
                } else {
-                       $id = $title->getArticleID( Title::GAID_FOR_UPDATE );
-                       $article = new Article( $title );
+                       $status = Status::newFatal( 'cannotdelete',
+                               wfEscapeWikiText( $title->getPrefixedText() )
+                       );
+                       $page = WikiPage::factory( $title );
                        $dbw = wfGetDB( DB_MASTER );
                        try {
                                // 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 );
-                                       }
+                               $error = '';
+                               if ( $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error, $user ) >= WikiPage::DELETE_SUCCESS ) {
                                        $status = $file->delete( $reason, $suppress );
-                                       if( $status->ok ) {
+                                       if( $status->isOK() ) {
                                                $dbw->commit();
                                        } else {
                                                $dbw->rollback();
@@ -154,8 +165,10 @@ class FileDeleteForm {
                                throw $e;
                        }
                }
-               if( $status->isGood() )
-                       wfRunHooks('FileDeleteComplete', array( &$file, &$oldimage, &$article, &$wgUser, &$reason));
+
+               if ( $status->isOK() ) {
+                       wfRunHooks( 'FileDeleteComplete', array( &$file, &$oldimage, &$page, &$user, &$reason ) );
+               }
 
                return $status;
        }
@@ -183,7 +196,7 @@ class FileDeleteForm {
                        'id' => 'mw-img-deleteconfirm' ) ) .
                        Xml::openElement( 'fieldset' ) .
                        Xml::element( 'legend', null, wfMsg( 'filedelete-legend' ) ) .
-                       Html::hidden( 'wpEditToken', $wgUser->editToken( $this->oldimage ) ) .
+                       Html::hidden( 'wpEditToken', $wgUser->getEditToken( $this->oldimage ) ) .
                        $this->prepareMessage( 'filedelete-intro' ) .
                        Xml::openElement( 'table', array( 'id' => 'mw-img-deleteconfirm-table' ) ) .
                        "<tr>