From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 30 Oct 2009 14:30:51 +0000 (+0000)
Subject: Remove section edit links in edit conflict form pointing nowhere useful and only... 
X-Git-Tag: 1.31.0-rc.0~39024
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/modifier.php?a=commitdiff_plain;h=2bb3fd049d633bd1e839dd78ad0d4163be2dde4f;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index daa30e1ba7..c5126dbd88 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -609,6 +609,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   can be used to get an error message string
 * The error message shown in Special:ChangePassword now parses wiki markup
 * (bug 19859) Removed experimental HTMLDiff feature
+* Removed section edit links in edit conflict form
 
 == API changes in 1.16 ==
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index d90d6f58aa..6e8573d09e 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1601,13 +1601,13 @@ END
 );
 
 		if ( $this->isConflict && wfRunHooks( 'EditPageBeforeConflictDiff', array( &$this, &$wgOut ) ) ) {
-			$wgOut->wrapWikiMsg( '==$1==', "yourdiff" );
+			$wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourdiff" );
 
 			$de = new DifferenceEngine( $this->mTitle );
 			$de->setText( $this->textbox2, $this->textbox1 );
 			$de->showDiff( wfMsg( "yourtext" ), wfMsg( "storedversion" ) );
 
-			$wgOut->wrapWikiMsg( '==$1==', "yourtext" );
+			$wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourtext" );
 			$this->showTextbox2();
 		}
 		$wgOut->addHTML( $this->editFormTextBottom );