| Index: branches/wmf-deployment-work/includes/specials/SpecialMovepage.php |
| — | — | @@ -17,8 +17,10 @@ |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | $target = isset( $par ) ? $par : $wgRequest->getVal( 'target' ); |
| | 21 | + |
| | 22 | + // Yes, the use of getVal() and getText() is wanted, see bug 20365 |
| 21 | 23 | $oldTitleText = $wgRequest->getVal( 'wpOldTitle', $target ); |
| 22 | | - $newTitleText = $wgRequest->getVal( 'wpNewTitle' ); |
| | 24 | + $newTitleText = $wgRequest->getText( 'wpNewTitle' ); |
| 23 | 25 | |
| 24 | 26 | $oldTitle = Title::newFromText( $oldTitleText ); |
| 25 | 27 | $newTitle = Title::newFromText( $newTitleText ); |
| — | — | @@ -87,7 +89,7 @@ |
| 88 | 90 | * OutputPage::wrapWikiMsg(). |
| 89 | 91 | */ |
| 90 | 92 | function showForm( $err ) { |
| 91 | | - global $wgOut, $wgUser, $wgFixDoubleRedirects; |
| | 93 | + global $wgOut, $wgUser, $wgContLang, $wgFixDoubleRedirects; |
| 92 | 94 | |
| 93 | 95 | $skin = $wgUser->getSkin(); |
| 94 | 96 | |
| — | — | @@ -200,7 +202,7 @@ |
| 201 | 203 | Xml::label( wfMsg( 'newtitle' ), 'wpNewTitle' ) . |
| 202 | 204 | "</td> |
| 203 | 205 | <td class='mw-input'>" . |
| 204 | | - Xml::input( 'wpNewTitle', 40, $newTitle->getPrefixedText(), array( 'type' => 'text', 'id' => 'wpNewTitle' ) ) . |
| | 206 | + Xml::input( 'wpNewTitle', 40, $wgContLang->recodeForEdit( $newTitle->getPrefixedText() ), array( 'type' => 'text', 'id' => 'wpNewTitle' ) ) . |
| 205 | 207 | Xml::hidden( 'wpOldTitle', $this->oldTitle->getPrefixedText() ) . |
| 206 | 208 | "</td> |
| 207 | 209 | </tr> |
| Property changes on: branches/wmf-deployment-work/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 208 | 210 | + /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/wmf-deployment/includes/specials:53381 |
| /trunk/phase3/includes/specials:56188 |