From c4fb5ef08a51cbf4828458104472fc3848d8c938 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Thu, 25 Mar 2010 21:11:38 +0000 Subject: [PATCH] Stop mutually exclusive values in ApiDelete and ApiMove --- includes/api/ApiDelete.php | 4 ++++ includes/api/ApiMove.php | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php index 9689c97c85..aca6b63740 100644 --- 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 3b2fe9999b..f7a5f9ae61 100644 --- 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'] = ''; } -- 2.20.1