* (bug 20299) MediaWiki:Move-subpages and MediaWiki:Move-talk-subpages can now use...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 409712e..862a239 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -428,6 +428,8 @@ this. Was used when mwEmbed was going to be an extension.
 * (bug 20365) Page name with with c/g/h/j/s/u + x are now correctly handled in
   Special:MovePage with Esperanto as content language
 * (bug 20364) Fixed regression in GIF metadata loading
+* (bug 20299) MediaWiki:Move-subpages and MediaWiki:Move-talk-subpages can now
+  use wikitext
 
 == API changes in 1.16 ==
 

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 9fad196..0c92a8a 100644 (file)
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -258,19 +258,23 @@ class MovePageForm {
                                <tr>
                                        <td></td>
                                        <td class=\"mw-input\">" .
-                               Xml::checkLabel( wfMsgExt(
+                               Xml::check(
+                                       'wpMovesubpages',
+                                       # Don't check the box if we only have talk subpages to
+                                       # move and we aren't moving the talk page.
+                                       $this->moveSubpages && ($this->oldTitle->hasSubpages() || $this->moveTalk),
+                                       array( 'id' => 'wpMovesubpages' )
+                               ) . '&nbsp;' .
+                               Xml::tags( 'label', array( 'for' => 'wpMovesubpages' ),
+                                       wfMsgExt(
                                                ( $this->oldTitle->hasSubpages()
                                                        ? 'move-subpages'
                                                        : 'move-talk-subpages' ),
-                                               array( 'parsemag' ),
+                                               array( 'parseinline' ),
                                                $wgLang->formatNum( $wgMaximumMovedPages ),
                                                # $2 to allow use of PLURAL in message.
                                                $wgMaximumMovedPages
-                                       ),
-                                       'wpMovesubpages', 'wpMovesubpages',
-                                       # Don't check the box if we only have talk subpages to
-                                       # move and we aren't moving the talk page.
-                                       $this->moveSubpages && ($this->oldTitle->hasSubpages() || $this->moveTalk)
+                                       )
                                ) .
                                        "</td>
                                </tr>"