Index: trunk/phase3/includes/EditPage.php |
— | — | @@ -1601,13 +1601,13 @@ |
1602 | 1602 | ); |
1603 | 1603 | |
1604 | 1604 | if ( $this->isConflict && wfRunHooks( 'EditPageBeforeConflictDiff', array( &$this, &$wgOut ) ) ) { |
1605 | | - $wgOut->wrapWikiMsg( '==$1==', "yourdiff" ); |
| 1605 | + $wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourdiff" ); |
1606 | 1606 | |
1607 | 1607 | $de = new DifferenceEngine( $this->mTitle ); |
1608 | 1608 | $de->setText( $this->textbox2, $this->textbox1 ); |
1609 | 1609 | $de->showDiff( wfMsg( "yourtext" ), wfMsg( "storedversion" ) ); |
1610 | 1610 | |
1611 | | - $wgOut->wrapWikiMsg( '==$1==', "yourtext" ); |
| 1611 | + $wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourtext" ); |
1612 | 1612 | $this->showTextbox2(); |
1613 | 1613 | } |
1614 | 1614 | $wgOut->addHTML( $this->editFormTextBottom ); |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -609,6 +609,7 @@ |
610 | 610 | can be used to get an error message string |
611 | 611 | * The error message shown in Special:ChangePassword now parses wiki markup |
612 | 612 | * (bug 19859) Removed experimental HTMLDiff feature |
| 613 | +* Removed section edit links in edit conflict form |
613 | 614 | |
614 | 615 | == API changes in 1.16 == |
615 | 616 | |