Fix the last assignment in conditional, bit of code duplication, as the next isn...

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

diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 52f0929..0eba219 100644 (file)
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * API for MediaWiki 1.8+
+ *
  *
  * Created on Jun 30, 2007
  *
- * Copyright © 2007 Roan Kattouw <Firstname>.<Lastname>@home.nl
+ * Copyright © 2007 Roan Kattouw <Firstname>.<Lastname>@gmail.com
  *
  * 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
@@ -30,7 +30,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 }
 
 /**
- * API module that facilitates deleting pages. The API eqivalent of action=delete.
+ * API module that facilitates deleting pages. The API equivalent of action=delete.
  * Requires API write mode to be enabled.
  *
  * @ingroup API
@@ -82,7 +82,6 @@ class ApiDelete extends ApiBase {
                                $this->dieUsageMsg( reset( $retval ) ); // We don't care about multiple errors, just report one of them
                        }
 
-                       $watch = 'nochange';
                        // Deprecated parameters
                        if ( $params['watch'] ) {
                                $watch = 'watch';
@@ -98,6 +97,11 @@ class ApiDelete extends ApiBase {
                $this->getResult()->addValue( null, $this->getModuleName(), $r );
        }
 
+       /**
+        *
+        * @param &$title Title
+        * @param $token String
+        */
        private static function getPermissionsError( &$title, $token ) {
                global $wgUser;
 
@@ -142,18 +146,23 @@ class ApiDelete extends ApiBase {
                }
 
                $error = '';
-               if ( !wfRunHooks( 'ArticleDelete', array( &$article, &$wgUser, &$reason, $error ) ) ) {
-                       return array( array( 'hookaborted', $error ) );
-               }
-
                // Luckily, Article.php provides a reusable delete function that does the hard work for us
-               if ( $article->doDeleteArticle( $reason ) ) {
-                       wfRunHooks( 'ArticleDeleteComplete', array( &$article, &$wgUser, $reason, $article->getId() ) );
+               if ( $article->doDeleteArticle( $reason, false, 0, true, $error ) ) {
                        return array();
+               } else {
+                       return array( array( 'cannotdelete', $article->mTitle->getPrefixedText() ) );
                }
-               return array( array( 'cannotdelete', $article->mTitle->getPrefixedText() ) );
        }
 
+       /**
+        * @static
+        * @param $token
+        * @param $title Title
+        * @param $oldimage
+        * @param $reason
+        * @param $suppress bool
+        * @return \type|array|Title
+        */
        public static function deleteFile( $token, &$title, $oldimage, &$reason = null, $suppress = false ) {
                $errors = self::getPermissionsError( $title, $token );
                if ( count( $errors ) ) {
@@ -215,8 +224,11 @@ class ApiDelete extends ApiBase {
                                        'nochange'
                                ),
                        ),
-                       'unwatch' => false,
-                       'oldimage' => null
+                       'unwatch' => array(
+                               ApiBase::PARAM_DFLT => false,
+                               ApiBase::PARAM_DEPRECATED => true,
+                       ),
+                       'oldimage' => null,
                );
        }
 
@@ -239,12 +251,19 @@ class ApiDelete extends ApiBase {
        }
 
        public function getPossibleErrors() {
-               return array_merge( parent::getPossibleErrors(), array(
-                       array( 'invalidtitle', 'title' ),
-                       array( 'nosuchpageid', 'pageid' ),
-                       array( 'notanarticle' ),
-                       array( 'hookaborted', 'error' ),
-               ) );
+               return array_merge( parent::getPossibleErrors(),
+                       $this->getRequireOnlyOneParameterErrorMessages( array( 'title', 'pageid' ) ),
+                       array(
+                               array( 'invalidtitle', 'title' ),
+                               array( 'nosuchpageid', 'pageid' ),
+                               array( 'notanarticle' ),
+                               array( 'hookaborted', 'error' ),
+                       )
+               );
+       }
+
+       public function needsToken() {
+               return true;
        }
 
        public function getTokenSalt() {
@@ -261,4 +280,4 @@ class ApiDelete extends ApiBase {
        public function getVersion() {
                return __CLASS__ . ': $Id$';
        }
-}
\ No newline at end of file
+}