| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -1295,7 +1295,7 @@ |
| 1296 | 1296 | // and fallback to the raw wpTextbox1 since editconflicts can't be |
| 1297 | 1297 | // resolved between page source edits and custom ui edits using the |
| 1298 | 1298 | // custom edit ui. |
| 1299 | | - $this->showTextbox1(); |
| | 1299 | + $this->showTextbox1( null, $this->getContent() ); |
| 1300 | 1300 | } else { |
| 1301 | 1301 | $this->showContentForm(); |
| 1302 | 1302 | } |
| — | — | @@ -1775,7 +1775,11 @@ |
| 1776 | 1776 | $wgOut->addHTML( " <span class='editHelp'>{$cancel}{$separator}{$edithelp}</span>\n" ); |
| 1777 | 1777 | $wgOut->addHTML( "</div><!-- editButtons -->\n</div><!-- editOptions -->\n" ); |
| 1778 | 1778 | } |
| 1779 | | - |
| | 1779 | + |
| | 1780 | + /* |
| | 1781 | + * Show an edit conflict. textbox1 is already shown in showEditForm(). |
| | 1782 | + * If you want to use another entry point to this function, be careful. |
| | 1783 | + */ |
| 1780 | 1784 | protected function showConflict() { |
| 1781 | 1785 | global $wgOut; |
| 1782 | 1786 | $this->textbox2 = $this->textbox1; |