re r64962 clean up the logic for watchlist a little
authorMark A. Hershberger <mah@users.mediawiki.org>
Mon, 12 Apr 2010 20:15:04 +0000 (20:15 +0000)
committerMark A. Hershberger <mah@users.mediawiki.org>
Mon, 12 Apr 2010 20:15:04 +0000 (20:15 +0000)
includes/api/ApiMove.php

index 2752448..e59855b 100644 (file)
@@ -122,11 +122,10 @@ class ApiMove extends ApiBase {
                        }
                }
 
-               $watch = $params['watchlist'];
-               if ( $wgUser->getOption( 'watchmoves' ) ) {
-                       $watch = 'watch';
-               }
-               if ( $params['watch'] ) {
+               $watch = "preferences";
+               if ( isset( $params['watchlist'] ) ) {
+                       $watch = $params['watchlist'];
+               } elseif ( $wgUser->getOption( 'watchmoves' ) || $params['watch'] ) {
                        $watch = 'watch';
                } elseif ( $params['unwatch'] ) {
                        $watch = 'unwatch';