(bug 20052) Watch checkbox on Special:Movepage is checked by default when the old...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c397571..365c98e 100644 (file)
--- 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 70b1594..f583d1a 100644 (file)
--- 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>