Merge "Add broken-file-category for file links inside <gallery/>"

[lhc/web/wiklou.git] / includes / api / ApiDelete.php

diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index cfa8035..aea1048 100644 (file)
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -32,10 +32,6 @@
  */
 class ApiDelete extends ApiBase {
 
-       public function __construct( $main, $action ) {
-               parent::__construct( $main, $action );
-       }
-
        /**
         * Extracts the title, token, and reason from the request parameters and invokes
         * the local delete() function with these as arguments. It does not make use of
@@ -65,8 +61,7 @@ class ApiDelete extends ApiBase {
                        $this->dieUsageMsg( $status[0] );
                }
                if ( !$status->isGood() ) {
-                       $errors = $status->getErrorsArray();
-                       $this->dieUsageMsg( $errors[0] ); // We don't care about multiple errors, just report one of them
+                       $this->dieStatus( $status );
                }
 
                // Deprecated parameters
@@ -103,8 +98,8 @@ class ApiDelete extends ApiBase {
         *
         * @param $page Page|WikiPage object to work on
         * @param $user User doing the action
-        * @param $token String delete token (same as edit token)
-        * @param $reason String|null reason for the deletion. Autogenerated if NULL
+        * @param string $token delete token (same as edit token)
+        * @param string|null $reason reason for the deletion. Autogenerated if NULL
         * @return Status|array
         */
        public static function delete( Page $page, User $user, $token, &$reason = null ) {