From 0a7ce36121131f24b960e40964db0956883509ae Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sat, 26 Sep 2009 09:22:44 +0000
Subject: [PATCH] API: (bug 20816) Editing a page with &watchlist=preferences
 (default) unwatches it if you're watching it but don't have watching
 preferences set. This is a regression from r53266

---
 includes/api/ApiEditPage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index a9d489df0c..bc2ede03fb 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -180,7 +180,7 @@ class ApiEditPage extends ApiBase {
 				break;
 			case 'preferences':
 				if ($titleObj->exists())
-					$watch = $wgUser->getOption('watchdefault');
+					$watch = $wgUser->getOption('watchdefault') || $titleObj->userIsWatching();
 				else
 					$watch = $wgUser->getOption('watchcreations');
 				break;
-- 
2.20.1