Stop mutually exclusive values in ApiRollback and ApiUndelete

diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php
index 849e0f6..7db4a17 100644 (file)
--- a/includes/api/ApiRollback.php
+++ b/includes/api/ApiRollback.php
@@ -38,6 +38,10 @@ class ApiRollback extends ApiBase {
 
        public function execute() {
                $params = $this->extractRequestParams();
+               
+               if ( isset( $params['watch'] ) && params( $show['unwatch'] ) ) {
+                       $this->dieUsageMsg( array( 'show' ) );
+               }
 
                $titleObj = null;
                if ( !isset( $params['title'] ) ) {

diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index d88d65b..470bfe8 100644 (file)
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -39,6 +39,10 @@ class ApiUndelete extends ApiBase {
        public function execute() {
                global $wgUser;
                $params = $this->extractRequestParams();
+               
+               if ( isset( $params['watch'] ) && params( $show['unwatch'] ) ) {
+                       $this->dieUsageMsg( array( 'show' ) );
+               }
 
                $titleObj = null;
                if ( !isset( $params['title'] ) ) {