API: (bug 20816) Editing a page with &watchlist=preferences (default) unwatches it...

diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index a9d489d..bc2ede0 100644 (file)
--- 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;