r102583 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r102582‎ | r102583 | r102584 >
Date:22:08, 9 November 2011
Author:rmoen
Status:resolved (Comments)
Tags:
Comment:
essage=This bug fixes bug30483
Modified paths:
  • /trunk/phase3/includes/specials/SpecialMovepage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/specials/SpecialMovepage.php
——@@ -195,7 +195,7 @@
196196 $token = htmlspecialchars( $user->editToken() );
197197
198198 if ( !empty($err) ) {
199 - $out->addSubtitle( $this->msg( 'formerror' ) );
 199+ $out->setSubtitle( wfMsg( 'formerror' ) );
200200 if( $err[0] == 'hookaborted' ) {
201201 $hookErr = $err[1];
202202 $errMsg = "<p><strong class=\"error\">$hookErr</strong></p>\n";
——@@ -239,7 +239,7 @@
240240 Xml::label( wfMsg( 'newtitle' ), 'wpNewTitle' ) .
241241 "</td>
242242 <td class='mw-input'>" .
243 - Xml::input( 'wpNewTitle', 40, $wgContLang->recodeForEdit( $newTitle->getPrefixedText() ), array( 'type' => 'text', 'id' => 'wpNewTitle' ) ) .
 243+ Xml::input( 'wpNewTitle', 60, $wgContLang->recodeForEdit( $newTitle->getPrefixedText() ), array( 'type' => 'text', 'id' => 'wpNewTitle' ) ) .
244244 Html::hidden( 'wpOldTitle', $this->oldTitle->getPrefixedText() ) .
245245 "</td>
246246 </tr>

Follow-up revisions

RevisionCommit summaryAuthorDate
r102589essage=fix trumped line of code from svn updatermoen22:53, 9 November 2011

Comments

#Comment by IAlex (talk | contribs)   22:15, 9 November 2011

It seems taht the first part of this revision reverts r102417, merge issue?

Also please use a descriptive commit summary about what it does and not only which bug it fixes and if you fix a bug, please add a note in the RELEASE-NOTES file.

#Comment by Nikerabbit (talk | contribs)   09:02, 10 November 2011

The author is not linked to an user account yet. He committed a followup.

#Comment by Robmoen (talk | contribs)   00:08, 16 November 2011

Indeed, this was a merge issue. Restored line of code in r102589

Status & tagging log