From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Tue, 11 Aug 2009 18:03:35 +0000 (+0000)
Subject: (bug 20052) Watch checkbox on Special:Movepage is checked by default when the old... 
X-Git-Tag: 1.31.0-rc.0~40355
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=1da0f63b8ad648696015e4fbbbe3989897d9325d;p=lhc%2Fweb%2Fwiklou.git

(bug 20052) Watch checkbox on Special:Movepage is checked by default when the old or new page is being watched.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c397571002..365c98e2a6 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -197,6 +197,8 @@ this. Was used when mwEmbed was going to be an extension.
    output by omitting some things like quotation marks where HTML 5 allows.
 * Added crop for inline images.
 * The description message in $wgExtensionCredits can be an array with parameters
+* (bug 20052) Watch checkbox on Special:Movepage is checked by default when the
+  old or new page is being watched.
 
 === Bug fixes in 1.16 ===
 
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 70b15948f1..f583d1a5bb 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -277,8 +277,11 @@ class MovePageForm {
 			);
 		}
 
+		# Check the watch checkbox in case the watch parameter was given in the 
+		# request, the preferences say so, or either the old or new title is 
+		# being watched.
 		$watchChecked = $this->watch || $wgUser->getBoolOption( 'watchmoves' ) 
-			|| $this->oldTitle->userIsWatching();
+			|| $this->oldTitle->userIsWatching() || $this->newTitle->userIsWatching();
 		$wgOut->addHTML( "
 			<tr>
 				<td></td>