Remove section edit links in edit conflict form pointing nowhere useful and only...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index daa30e1..c5126db 100644 (file)
--- 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 d90d6f5..6e8573d 100644 (file)
--- 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 );