Followup r64197

Return null in getWatchlistValue if no change

Fixup unneccessary watch/unwatch calls

Remove useless unwatch from ApiUpload

diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 1cc1e30..0570421 100644 (file)
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -542,14 +542,14 @@ abstract class ApiBase {
                        case 'unwatch':
                                return false;
                        case 'preferences':
-                               if ( $titleObj->exists() ) {
-                                       global $wgUser;
-                                       return $wgUser->getOption( 'watchdefault' ) || $titleObj->userIsWatching();
+                               global $wgUser;
+                               if ( $titleObj->exists() && !$titleObj->userIsWatching() && $wgUser->getOption( 'watchdefault' ) ) {                            
+                                       return true;
                                }
-                               return false;
+                               return null;
                        case 'nochange':
                        default:
-                               return $titleObj->userIsWatching();
+                               return null;
                }
        }
 

diff --git a/includes/api/ApiDelete.php b/includes/api/ApiDelete.php
index 1b6b394..df16682 100644 (file)
--- a/includes/api/ApiDelete.php
+++ b/includes/api/ApiDelete.php
@@ -85,10 +85,18 @@ class ApiDelete extends ApiBase {
                        $watch = $this->getWatchlistValue( $params['watchlist'], $titleObj ) || $wgUser->getOption( 'watchdeletion' );
 
                        // Deprecated parameters
-                       if ( $params['watch'] || $watch ) {
-                               $articleObj->doWatch();
-                       } elseif ( $params['unwatch'] || !$watch ) {
-                               $articleObj->doUnwatch();
+                       if ( $params['watch'] ) {
+                               $watch = true;
+                       } elseif ( $params['unwatch'] ) {
+                               $watch = false;
+                       }
+                       
+                       if ( $watch !== null ) {
+                               if ( $watch ) {
+                                       $articleObj->doWatch();
+                               } else {
+                                       $articleObj->doUnwatch();
+                               }
                        }
                }
 

diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index ea3bcd6..77377b0 100644 (file)
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -211,7 +211,7 @@ class ApiEditPage extends ApiBase {
                        $watch = false;
                }
 
-               if ( $watch ) {
+               if ( $watch || $titleObj->userIsWatching() ) {
                        $reqArr['wpWatchthis'] = '';
                }
 

diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index 62609fd..603ef59 100644 (file)
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -124,14 +124,22 @@ class ApiMove extends ApiBase {
                
                // Watch pages
                $watch = $this->getWatchlistValue( $params['watchlist'], $titleObj ) || $wgUser->getOption( 'watchmoves' );
-
+               
                // Deprecated parameters
-               if ( $params['watch'] || $watch ) {
-                       $wgUser->addWatch( $fromTitle );
-                       $wgUser->addWatch( $toTitle );
-               } elseif ( $params['unwatch'] || !$watch ) {
-                       $wgUser->removeWatch( $fromTitle );
-                       $wgUser->removeWatch( $toTitle );
+               if ( $params['watch'] ) {
+                       $watch = true;
+               } elseif ( $params['unwatch'] ) {
+                       $watch = false;
+               }
+
+               if ( $watch !== null ) {
+                       if ( $watch ) {
+                               $wgUser->addWatch( $fromTitle );
+                               $wgUser->addWatch( $toTitle );
+                       } else {
+                               $wgUser->removeWatch( $fromTitle );
+                               $wgUser->removeWatch( $toTitle );
+                       }
                }
                $this->getResult()->addValue( null, $this->getModuleName(), $r );
        }

diff --git a/includes/api/ApiProtect.php b/includes/api/ApiProtect.php
index 4c0398e..4e7f1fc 100644 (file)
--- a/includes/api/ApiProtect.php
+++ b/includes/api/ApiProtect.php
@@ -116,10 +116,16 @@ class ApiProtect extends ApiBase {
                
                $watch = $this->getWatchlistValue( $params['watchlist'], $titleObj );
                
-               if ( $params['watch'] || $watch ) {
-                       $articleObj->doWatch();
-               } else {
-                       $articleObj->doUnwatch();
+               if ( $params['watch'] ) {
+                       $watch = true;
+               }
+               
+               if ( $watch !== null ) {
+                       if ( $watch ) {
+                               $articleObj->doWatch();
+                       } else {
+                               $articleObj->doUnwatch();
+                       }
                }
 
                if ( $titleObj->exists() ) {

diff --git a/includes/api/ApiRollback.php b/includes/api/ApiRollback.php
index 263a78a..70dbc56 100644 (file)
--- a/includes/api/ApiRollback.php
+++ b/includes/api/ApiRollback.php
@@ -75,10 +75,12 @@ class ApiRollback extends ApiBase {
                
                $watch = $this->getWatchlistValue( $params['watchlist'], $titleObj );
                
-               if ( $watch ) {
-                       $articleObj->doWatch();
-               } else if ( !$watch ) {
-                       $articleObj->doUnwatch();
+               if ( $watch !== null) {
+                       if ( $watch ) {
+                               $articleObj->doWatch();
+                       } else {
+                               $articleObj->doUnwatch();
+                       }
                }
 
                $info = array(

diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index 1fed5ca..421744f 100644 (file)
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -84,10 +84,12 @@ class ApiUndelete extends ApiBase {
                
                $watch = $this->getWatchlistValue( $params['watchlist'], $titleObj );
                
-               if ( $params['watch'] || $watch ) {
-                       $wgUser->addWatch( $titleObj );
-               } else {
-                       $wgUser->removeWatch( $titleObj );
+               if ( $watch !== null ) {
+                       if ( $watch ) {
+                               $wgUser->addWatch( $titleObj );
+                       } else {
+                               $wgUser->removeWatch( $titleObj );
+                       }
                }
 
                $info['title'] = $titleObj->getPrefixedText();

diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 0206744..0fb17cc 100644 (file)
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -239,10 +239,6 @@ class ApiUpload extends ApiBase {
                
                $file = $this->mUpload->getLocalFile();
                
-               if ( !$watch ) {
-                       $wgUser->removeWatch( $file->getTitle() );
-               }
-               
                $result['result'] = 'Success';
                $result['filename'] = $file->getName();
                $result['imageinfo'] = $this->mUpload->getImageInfo( $this->getResult() );
@@ -274,7 +270,6 @@ class ApiUpload extends ApiBase {
                                ApiBase::PARAM_DFLT => 'preferences',
                                ApiBase::PARAM_TYPE => array(
                                        'watch',
-                                       'unwatch',
                                        'preferences',
                                        'nochange'
                                ),