Revert r86001: Brion says it's too scary :D will recommit in pieces

[lhc/web/wiklou.git] / includes / specials / SpecialMovepage.php

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index f6259c2..2be33d0 100644 (file)
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -359,11 +359,8 @@ class MovePageForm extends UnlistedSpecialPage {
                        $article = new Article( $nt );
 
                        # Disallow deletions of big articles
-                       global $wgDeleteRevisionsLimit;
-                       if ( $wgDeleteRevisionsLimit
-                                       && $this->estimateRevisionCount() > $wgDeleteRevisionsLimit
-                                       && !$nt->userCan( 'bigdelete' ) )
-                       {
+                       $bigHistory = $article->isBigDeletion();
+                       if( $bigHistory && !$nt->userCan( 'bigdelete' ) ) {
                                global $wgDeleteRevisionsLimit;
                                $this->showForm( array('delete-toobig', $wgLang->formatNum( $wgDeleteRevisionsLimit ) ) );
                                return;
@@ -376,10 +373,7 @@ class MovePageForm extends UnlistedSpecialPage {
                        }
 
                        // This may output an error message and exit
-                       Action::factory( 'delete', $article )->execute(
-                               array( 'Reason' => wfMsgForContent( 'delete_and_move_reason' ) ),
-                               false // Do not capture exceptions
-                       );
+                       $article->doDelete( wfMsgForContent( 'delete_and_move_reason' ) );
                }
 
                # don't allow moving to pages with # in