Stop mutually exclusive values in ApiDelete and ApiMove

diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 9689c97..aca6b63 100644 (file)
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -52,6 +52,10 @@ class ApiDelete extends ApiBase {
                $params = $this->extractRequestParams();
 
                $this->requireOnlyOneParameter( $params, 'title', 'pageid' );
+               
+               if ( isset( $params['watch'] ) && params( $show['unwatch'] ) ) {
+                       $this->dieUsageMsg( array( 'show' ) );
+               }
 
                if ( isset( $params['title'] ) ) {
                        $titleObj = Title::newFromText( $params['title'] );

diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index 3b2fe99..f7a5f9a 100644 (file)
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -39,6 +39,11 @@ class ApiMove extends ApiBase {
        public function execute() {
                global $wgUser;
                $params = $this->extractRequestParams();
+               
+               if ( isset( $params['watch'] ) && params( $show['unwatch'] ) ) {
+                       $this->dieUsageMsg( array( 'show' ) );
+               }
+               
                if ( is_null( $params['reason'] ) ) {
                        $params['reason'] = '';
                }