Followup to r64197

Remove the mutually exclusive else checks

Fix undefined on getWatchlistValue in ApiBase

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index eaf07b9..f733765 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -538,24 +538,20 @@ abstract class ApiBase {
        protected function getWatchlistValue ( $watchlist, $titleObj ) {
                switch ( $watchlist ) {
                        case 'watch':
-                               $watch = true;
-                               break;
+                               return true;
                        case 'unwatch':
-                               $watch = false;
-                               break;
-                       case 'preferences':
-                               global $wgUser;
-                       
+                               return false;
+                       case 'preferences':                     
                                if ( $titleObj->exists() ) {
-                                       $watch = $wgUser->getOption( 'watchdefault' ) || $titleObj->userIsWatching();
+                                       global $wgUser;
+                               
+                                       return ($wgUser->getOption( 'watchdefault' ) || $titleObj->userIsWatching());
                                }
-                               break;
+                               return false;
                        case 'nochange':
                        default:
-                               $watch = $titleObj->userIsWatching();
+                               return $titleObj->userIsWatching();
                }
-               
-               return $watch;
        }
 
        /**

diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php
index bb32cda..4c0398e 100644 (file)
--- a/includes/api/ApiProtect.php
+++ b/includes/api/ApiProtect.php
@@ -118,7 +118,7 @@ class ApiProtect extends ApiBase {
                
                if ( $params['watch'] || $watch ) {
                        $articleObj->doWatch();
-               } else if ( !$watch ) {
+               } else {
                        $articleObj->doUnwatch();
                }
 

diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index 46b0118..1fed5ca 100644 (file)
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -86,7 +86,7 @@ class ApiUndelete extends ApiBase {
                
                if ( $params['watch'] || $watch ) {
                        $wgUser->addWatch( $titleObj );
-               } else if ( !$watch ) {
+               } else {
                        $wgUser->removeWatch( $titleObj );
                }