Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing bug 23139 (introduced in r59655) which broke edit conflict resolution

Browse source
This commit is contained in:
Tobias 2010-04-10 14:11:40 +00:00
parent 9f71ca5f1c
commit 47fadf1ed1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/EditPage.php
View file

@ -1295,7 +1295,7 @@ HTML
// and fallback to the raw wpTextbox1 since editconflicts can't be
// resolved between page source edits and custom ui edits using the
// custom edit ui.
$this->showTextbox1();
$this->showTextbox1( null, $this->getContent() );
} else {
$this->showContentForm();
}
@ -1775,7 +1775,11 @@ INPUTS
$wgOut->addHTML( " <span class='editHelp'>{$cancel}{$separator}{$edithelp}</span>\n" );
$wgOut->addHTML( "</div><!-- editButtons -->\n</div><!-- editOptions -->\n" );
}
/*
* Show an edit conflict. textbox1 is already shown in showEditForm().
* If you want to use another entry point to this function, be careful.
*/
protected function showConflict() {
global $wgOut;
$this->textbox2 = $this->textbox1;