Stop mutually exclusive values in ApiProtect

Fix fail in Delete, Move, Rollback, Undelete

diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index aca6b63..2d6debc 100644 (file)
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -53,7 +53,7 @@ class ApiDelete extends ApiBase {
 
                $this->requireOnlyOneParameter( $params, 'title', 'pageid' );
                
-               if ( isset( $params['watch'] ) && params( $show['unwatch'] ) ) {
+               if ( isset( $params['watch'] ) && isset( $params['unwatch'] ) ) {
                        $this->dieUsageMsg( array( 'show' ) );
                }
 

diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index f7a5f9a..0def28e 100644 (file)
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -40,7 +40,7 @@ class ApiMove extends ApiBase {
                global $wgUser;
                $params = $this->extractRequestParams();
                
-               if ( isset( $params['watch'] ) && params( $show['unwatch'] ) ) {
+               if ( isset( $params['watch'] ) && isset( $params['unwatch'] ) ) {
                        $this->dieUsageMsg( array( 'show' ) );
                }
                

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

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

diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index 470bfe8..c29916b 100644 (file)
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -40,7 +40,7 @@ class ApiUndelete extends ApiBase {
                global $wgUser;
                $params = $this->extractRequestParams();
                
-               if ( isset( $params['watch'] ) && params( $show['unwatch'] ) ) {
+               if ( isset( $params['watch'] ) && isset( $params['unwatch'] ) ) {
                        $this->dieUsageMsg( array( 'show' ) );
                }