| Property changes on: branches/REL1_16/phase3/includes/diff |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /branches/REL1_15/phase3/includes/diff:51646 |
| /branches/sqlite/includes/diff:58211-58321 |
| /branches/wmf-deployment/includes/diff:53381 |
| /trunk/phase3/includes/diff:63549,63764,63897-63901,64802 |
| 2 | 2 | + /branches/REL1_15/phase3/includes/diff:51646 |
| /branches/sqlite/includes/diff:58211-58321 |
| /branches/wmf-deployment/includes/diff:53381 |
| /trunk/phase3/includes/diff:63549,63764,63897-63901,64802,64881 |
| Property changes on: branches/REL1_16/phase3/includes/json/Services_JSON.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3 | 3 | - /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646 |
| /branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381 |
| /trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901 |
| 4 | 4 | + /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646 |
| /branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381 |
| /trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901,64881 |
| Property changes on: branches/REL1_16/phase3/includes/LocalisationCache.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 5 | 5 | - /branches/REL1_15/phase3/includes/LocalisationCache.php:51646 |
| /branches/sqlite/includes/LocalisationCache.php:58211-58321 |
| /branches/wmf-deployment/includes/LocalisationCache.php:53381 |
| /trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901 |
| 6 | 6 | + /branches/REL1_15/phase3/includes/LocalisationCache.php:51646 |
| /branches/sqlite/includes/LocalisationCache.php:58211-58321 |
| /branches/wmf-deployment/includes/LocalisationCache.php:53381 |
| /trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901,64881 |
| Index: branches/REL1_16/phase3/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/REL1_16/phase3/includes/OutputPage.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1768 | 1772 | - /branches/REL1_15/phase3/includes/OutputPage.php:51646 |
| /branches/wmf-deployment/includes/OutputPage.php:53381,57468 |
| /trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901 |
| 1769 | 1773 | + /branches/REL1_15/phase3/includes/OutputPage.php:51646 |
| /branches/wmf-deployment/includes/OutputPage.php:53381,57468 |
| /trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901,64881 |
| Property changes on: branches/REL1_16/phase3/includes/HistoryPage.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1770 | 1774 | - /branches/REL1_15/phase3/includes/PageHistory.php:51646 |
| /trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901 |
| 1771 | 1775 | + /branches/REL1_15/phase3/includes/PageHistory.php:51646 |
| /trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901,64881 |
| Property changes on: branches/REL1_16/phase3/includes/api |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1772 | 1776 | - /branches/REL1_15/phase3/includes/api:51646 |
| /branches/sqlite/includes/api:58211-58321 |
| /branches/wmf-deployment/includes/api:53381,59952 |
| /trunk/phase3/includes/api:63549,63764,63897-63901,64454 |
| 1773 | 1777 | + /branches/REL1_15/phase3/includes/api:51646 |
| /branches/sqlite/includes/api:58211-58321 |
| /branches/wmf-deployment/includes/api:53381,59952 |
| /trunk/phase3/includes/api:63549,63764,63897-63901,64454,64881 |
| Property changes on: branches/REL1_16/phase3/includes/ChangesList.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1774 | 1778 | - /branches/REL1_15/phase3/includes/ChangesList.php:51646 |
| /branches/wmf-deployment/includes/ChangesList.php:53381,57589 |
| /trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901 |
| 1775 | 1779 | + /branches/REL1_15/phase3/includes/ChangesList.php:51646 |
| /branches/wmf-deployment/includes/ChangesList.php:53381,57589 |
| /trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901,64881 |
| Property changes on: branches/REL1_16/phase3/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1776 | 1780 | - /trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901 |
| 1777 | 1781 | + /trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901,64881 |
| Property changes on: branches/REL1_16/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1778 | 1782 | - /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| /trunk/phase3/includes/specials:63045,63047,63490,63549,63764,63897-63901,64180,64837,64846,64860,64862 |
| 1779 | 1783 | + /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| /trunk/phase3/includes/specials:63045,63047,63490,63549,63764,63897-63901,64180,64837,64846,64860,64862,64881 |
| Property changes on: branches/REL1_16/phase3/includes |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1780 | 1784 | - /branches/REL1_15/phase3/includes:51646 |
| /branches/sqlite/includes:58211-58321 |
| /branches/wmf-deployment/includes:53381 |
| /trunk/phase3/includes:63549,63764,63897-63901 |
| 1781 | 1785 | + /branches/REL1_15/phase3/includes:51646 |
| /branches/sqlite/includes:58211-58321 |
| /branches/wmf-deployment/includes:53381 |
| /trunk/phase3/includes:63549,63764,63897-63901,64881 |
| Index: branches/REL1_16/phase3/RELEASE-NOTES |
| — | — | @@ -49,6 +49,8 @@ |
| 50 | 50 | * (bug 23117) Fixed API rollback, was returning "badtoken" for valid requests |
| 51 | 51 | * (bug 23127) Re-added missing $1 parameter to the uploadtext message |
| 52 | 52 | * Fixed a bug in the Vector skin where personal tools display behind the logo |
| | 53 | +* (bug 23139) Fixed a bug in edit conflict resolution, where both textboxes |
| | 54 | + showed the same text. |
| 53 | 55 | |
| 54 | 56 | === Changes since 1.16 beta 1 === |
| 55 | 57 | |