From c3de8dfd8c3cfc6fa66e1bf6cfd96253abf6c140 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Mon, 12 Apr 2010 20:15:04 +0000 Subject: [PATCH 1/1] re r64962 clean up the logic for watchlist a little --- includes/api/ApiMove.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php index 2752448577..e59855b368 100644 --- a/includes/api/ApiMove.php +++ b/includes/api/ApiMove.php @@ -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'; -- 2.20.1