Merge branch 'Wikidata' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into Wikidata

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

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index eedb68e..9d6ab65 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -1,10 +1,31 @@
 <?php
+/**
+ * File deletion user interface.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Rob Church <robchur@gmail.com>
+ * @ingroup Media
+ */
 
 /**
  * File deletion user interface
  *
  * @ingroup Media
- * @author Rob Church <robchur@gmail.com>
  */
 class FileDeleteForm {
 
@@ -89,9 +110,7 @@ class FileDeleteForm {
 
                        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>' );
+                               $wgOut->addWikiText( '<div class="error">' . $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) . '</div>' );
                        }
                        if( $status->ok ) {
                                $wgOut->setPageTitle( wfMessage( 'actioncomplete' ) );
@@ -101,9 +120,9 @@ class FileDeleteForm {
                                $wgOut->addReturnTo( $this->oldimage ? $this->title : Title::newMainPage() );
 
                                if ( $wgRequest->getCheck( 'wpWatch' ) && $wgUser->isLoggedIn() ) {
-                                       WatchAction::doWatch( $title, $wgUser );
+                                       WatchAction::doWatch( $this->title, $wgUser );
                                } elseif ( $this->title->userIsWatching() ) {
-                                       WatchAction::doUnwatch( $title, $wgUser );
+                                       WatchAction::doUnwatch( $this->title, $wgUser );
                                }
                        }
                        return;
@@ -117,11 +136,12 @@ 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, User $user = null ) {
                if ( $user === null ) {
@@ -142,29 +162,30 @@ class FileDeleteForm {
                                $log->addEntry( 'delete', $title, $logComment );
                        }
                } else {
-                       $status = Status::newFatal( 'error' );
-                       $id = $title->getArticleID( Title::GAID_FOR_UPDATE );
+                       $status = Status::newFatal( 'cannotdelete',
+                               wfEscapeWikiText( $title->getPrefixedText() )
+                       );
                        $page = WikiPage::factory( $title );
                        $dbw = wfGetDB( DB_MASTER );
                        try {
                                // delete the associated article first
                                $error = '';
-                               if ( $page->doDeleteArticle( $reason, $suppress, $id, false, $error, $user ) ) {
+                               if ( $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error, $user ) >= WikiPage::DELETE_SUCCESS ) {
                                        $status = $file->delete( $reason, $suppress );
-                                       if( $status->ok ) {
-                                               $dbw->commit();
+                                       if( $status->isOK() ) {
+                                               $dbw->commit( __METHOD__ );
                                        } else {
-                                               $dbw->rollback();
+                                               $dbw->rollback( __METHOD__ );
                                        }
                                }
                        } catch ( MWException $e ) {
                                // rollback before returning to prevent UI from displaying incorrect "View or restore N deleted edits?"
-                               $dbw->rollback();
+                               $dbw->rollback( __METHOD__ );
                                throw $e;
                        }
                }
 
-               if ( $status->isGood() ) {
+               if ( $status->isOK() ) {
                        wfRunHooks( 'FileDeleteComplete', array( &$file, &$oldimage, &$page, &$user, &$reason ) );
                }