From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Mon, 12 Apr 2010 20:15:04 +0000 (+0000)
Subject: re r64962 clean up the logic for watchlist a little
X-Git-Tag: 1.31.0-rc.0~37128
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=c3de8dfd8c3cfc6fa66e1bf6cfd96253abf6c140;p=lhc%2Fweb%2Fwiklou.git

re r64962 clean up the logic for watchlist a little
---

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';