r58362 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r58361‎ | r58362 | r58363 >
Date:14:30, 30 October 2009
Author:catrope
Status:ok (Comments)
Tags:
Comment:
Remove section edit links in edit conflict form pointing nowhere useful and only confusing people. Apparently this is a regression from r8855 (!) that went unnoticed for nearly 4.5 years. Hereby nominated for the Most Hilarious Bugs of All Time contest
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/EditPage.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/EditPage.php
@@ -1601,13 +1601,13 @@
16021602 );
16031603
16041604 if ( $this->isConflict && wfRunHooks( 'EditPageBeforeConflictDiff', array( &$this, &$wgOut ) ) ) {
1605 - $wgOut->wrapWikiMsg( '==$1==', "yourdiff" );
 1605+ $wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourdiff" );
16061606
16071607 $de = new DifferenceEngine( $this->mTitle );
16081608 $de->setText( $this->textbox2, $this->textbox1 );
16091609 $de->showDiff( wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
16101610
1611 - $wgOut->wrapWikiMsg( '==$1==', "yourtext" );
 1611+ $wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourtext" );
16121612 $this->showTextbox2();
16131613 }
16141614 $wgOut->addHTML( $this->editFormTextBottom );
Index: trunk/phase3/RELEASE-NOTES
@@ -609,6 +609,7 @@
610610 can be used to get an error message string
611611 * The error message shown in Special:ChangePassword now parses wiki markup
612612 * (bug 19859) Removed experimental HTMLDiff feature
 613+* Removed section edit links in edit conflict form
613614
614615 == API changes in 1.16 ==
615616

Follow-up revisions

RevisionCommit summaryAuthorDate
r92703(bug 25355) Parser generates edit section links for special pages...demon22:32, 20 July 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r8855* (bug 1989) Some messages converted to use addWikiText(), patch by Niklas La...avar02:05, 4 May 2005

Comments

#Comment by Tim Starling (talk | contribs)   04:07, 5 January 2010

Awesome. Presumably the edit section option should be off for all messages parsed by $wgOut, it seems to be on by default. Article has its own ParserOptions with edit section set explicitly to true, so it won't affect the main content text.

#Comment by Catrope (talk | contribs)   17:04, 5 January 2010

That would make sense, yes. However, I'm personally hesitant to do this, who knows if someone somewhere actually relies on this behavior.

Status & tagging log