Merge "+Test for Status->CleanParams with a callback"

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

diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index 87705a8..804f7a9 100644 (file)
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -272,7 +272,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
                        $this->getOutput()->addHTML(
                                Xml::openElement( 'form', array(
                                        'method' => 'POST',
-                                       'action' => $this->getTitle()->getLocalURL( array(
+                                       'action' => $this->getPageTitle()->getLocalURL( array(
                                                        'target' => $this->targetObj->getPrefixedDBkey(),
                                                        'file' => $archiveName,
                                                        'token' => $user->getEditToken( $archiveName ),
@@ -357,7 +357,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
                // Show form if the user can submit
                if ( $this->mIsAllowed ) {
                        $out = Xml::openElement( 'form', array( 'method' => 'post',
-                                       'action' => $this->getTitle()->getLocalURL( array( 'action' => 'submit' ) ),
+                                       'action' => $this->getPageTitle()->getLocalURL( array( 'action' => 'submit' ) ),
                                        'id' => 'mw-revdel-form-revisions' ) ) .
                                Xml::fieldset( $this->msg( 'revdelete-legend' )->text() ) .
                                $this->buildCheckBoxes() .
@@ -438,7 +438,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
                        $list->reset();
                        $bitfield = $list->current()->getBits(); // existing field
                        if ( $this->submitClicked ) {
-                               $bitfield = $this->extractBitfield( $this->extractBitParams(), $bitfield );
+                               $bitfield = RevisionDeleter::extractBitfield( $this->extractBitParams(), $bitfield );
                        }
                        foreach ( $this->checks as $item ) {
                                list( $message, $name, $field ) = $item;
@@ -557,17 +557,6 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
                return $bitfield;
        }
 
-       /**
-        * Put together a rev_deleted bitfield
-        * @deprecated since 1.22, use RevisionDeleter::extractBitfield instead
-        * @param array $bitPars extractBitParams() params
-        * @param int $oldfield current bitfield
-        * @return array
-        */
-       public static function extractBitfield( $bitPars, $oldfield ) {
-               return RevisionDeleter::extractBitfield( $bitPars, $oldfield );
-       }
-
        /**
         * Do the write operations. Simple wrapper for RevDel_*List::setVisibility().
         * @param $bitfield