| Index: branches/wmf/1.16wmf4/includes/EditPage.php |
| — | — | @@ -1286,7 +1286,7 @@ |
| 1287 | 1287 | // and fallback to the raw wpTextbox1 since editconflicts can't be |
| 1288 | 1288 | // resolved between page source edits and custom ui edits using the |
| 1289 | 1289 | // custom edit ui. |
| 1290 | | - $this->showTextbox1(); |
| | 1290 | + $this->showTextbox1( null, $this->getContent() ); |
| 1291 | 1291 | } else { |
| 1292 | 1292 | $this->showContentForm(); |
| 1293 | 1293 | } |
| — | — | @@ -1760,7 +1760,11 @@ |
| 1761 | 1761 | $wgOut->addHTML( " <span class='editHelp'>{$cancel}{$separator}{$edithelp}</span>\n" ); |
| 1762 | 1762 | $wgOut->addHTML( "</div><!-- editButtons -->\n</div><!-- editOptions -->\n" ); |
| 1763 | 1763 | } |
| 1764 | | - |
| | 1764 | + |
| | 1765 | + /* |
| | 1766 | + * Show an edit conflict. textbox1 is already shown in showEditForm(). |
| | 1767 | + * If you want to use another entry point to this function, be careful. |
| | 1768 | + */ |
| 1765 | 1769 | protected function showConflict() { |
| 1766 | 1770 | global $wgOut; |
| 1767 | 1771 | $this->textbox2 = $this->textbox1; |
| Property changes on: branches/wmf/1.16wmf4/includes/EditPage.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1768 | 1772 | + /branches/REL1_15/phase3/includes/EditPage.php:51646 |
| /branches/sqlite/includes/EditPage.php:58211-58321 |
| /branches/wmf-deployment/includes/EditPage.php:53381,60970 |
| /trunk/phase3/includes/EditPage.php:63549,63764,63897-63901,64881 |