re r64291 and r64852 use ApiBase::setWatch instead of wgUser->*Watch to set watches...

diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index 4647859..2752448 100644 (file)
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -121,26 +121,21 @@ class ApiMove extends ApiBase {
                                $this->getResult()->setIndexedTagName( $r['subpages-talk'], 'subpage' );
                        }
                }
-               
-               // Watch pages
-               $watch = $this->getWatchlistValue( $params['watchlist'], $fromTitle ) || $wgUser->getOption( 'watchmoves' );
-               
-               // Deprecated parameters
+
+               $watch = $params['watchlist'];
+               if ( $wgUser->getOption( 'watchmoves' ) ) {
+                       $watch = 'watch';
+               }
                if ( $params['watch'] ) {
-                       $watch = true;
+                       $watch = 'watch';
                } elseif ( $params['unwatch'] ) {
-                       $watch = false;
+                       $watch = 'unwatch';
                }
 
-               if ( $watch !== null ) {
-                       if ( $watch ) {
-                               $wgUser->addWatch( $fromTitle );
-                               $wgUser->addWatch( $toTitle );
-                       } else {
-                               $wgUser->removeWatch( $fromTitle );
-                               $wgUser->removeWatch( $toTitle );
-                       }
-               }
+               // Watch pages
+               $this->setWatch( $watch, $fromTitle );
+               $this->setWatch( $watch, $toTitle );
+
                $this->getResult()->addValue( null, $this->getModuleName(), $r );
        }