From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sat, 26 Sep 2009 09:22:44 +0000 (+0000)
Subject: API: (bug 20816) Editing a page with &watchlist=preferences (default) unwatches it... 
X-Git-Tag: 1.31.0-rc.0~39523
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=0a7ce36121131f24b960e40964db0956883509ae;p=lhc%2Fweb%2Fwiklou.git

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

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;