From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Tue, 11 Aug 2009 20:46:28 +0000 (+0000)
Subject: Revert r54795: Didn't work as expected and don't have time to fix.
X-Git-Tag: 1.31.0-rc.0~40350
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=ad446656174111a2f04cc4354311a02fe3e9cc35;p=lhc%2Fweb%2Fwiklou.git

Revert r54795: Didn't work as expected and don't have time to fix.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 365c98e2a6..c397571002 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -197,8 +197,6 @@ 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 f583d1a5bb..70b15948f1 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -277,11 +277,8 @@ 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->newTitle->userIsWatching();
+			|| $this->oldTitle->userIsWatching();
 		$wgOut->addHTML( "
 			<tr>
 				<td></td>