Merge "API: Add support for documenting dynamic parameters"

[lhc/web/wiklou.git] / includes / revisiondelete / RevisionDeleter.php

diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php
index ba1f0f6..d68ef45 100644 (file)
--- a/includes/revisiondelete/RevisionDeleter.php
+++ b/includes/revisiondelete/RevisionDeleter.php
@@ -85,7 +85,8 @@ class RevisionDeleter {
                if ( !$typeName ) {
                        throw new MWException( __METHOD__ . ": Unknown RevDel type '$typeName'" );
                }
-               return new self::$allowedTypes[$typeName]( $context, $title, $ids );
+               $class = self::$allowedTypes[$typeName];
+               return new $class( $context, $title, $ids );
        }
 
        /**
@@ -233,9 +234,9 @@ class RevisionDeleter {
         * @since 1.22
         * @param array $bitPars ExtractBitParams() params
         * @param int $oldfield Current bitfield
-        * @return array
+        * @return integer
         */
-       public static function extractBitfield( $bitPars, $oldfield ) {
+       public static function extractBitfield( array $bitPars, $oldfield ) {
                // Build the actual new rev_deleted bitfield
                $newBits = 0;
                foreach ( $bitPars as $const => $val ) {