http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65376
Revision: 65376
Author: tstarling
Date: 2010-04-21 11:06:28 +0000 (Wed, 21 Apr 2010)
Log Message:
-----------
MFT r64881, bug 23139: Fixed a bug in edit conflict resolution, where both
textboxes showed the same text.
Modified Paths:
--------------
branches/REL1_16/phase3/RELEASE-NOTES
branches/REL1_16/phase3/includes/EditPage.php
Property Changed:
----------------
branches/REL1_16/phase3/includes/
branches/REL1_16/phase3/includes/ChangesList.php
branches/REL1_16/phase3/includes/ConfEditor.php
branches/REL1_16/phase3/includes/HistoryPage.php
branches/REL1_16/phase3/includes/LocalisationCache.php
branches/REL1_16/phase3/includes/OutputPage.php
branches/REL1_16/phase3/includes/api/
branches/REL1_16/phase3/includes/diff/
branches/REL1_16/phase3/includes/json/Services_JSON.php
branches/REL1_16/phase3/includes/specials/
Modified: branches/REL1_16/phase3/RELEASE-NOTES
===================================================================
--- branches/REL1_16/phase3/RELEASE-NOTES 2010-04-21 10:59:22 UTC (rev
65375)
+++ branches/REL1_16/phase3/RELEASE-NOTES 2010-04-21 11:06:28 UTC (rev
65376)
@@ -49,6 +49,8 @@
* (bug 23117) Fixed API rollback, was returning "badtoken" for valid requests
* (bug 23127) Re-added missing $1 parameter to the uploadtext message
* Fixed a bug in the Vector skin where personal tools display behind the logo
+* (bug 23139) Fixed a bug in edit conflict resolution, where both textboxes
+ showed the same text.
=== Changes since 1.16 beta 1 ===
Property changes on: branches/REL1_16/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:63549,63764,63897-63901
+ /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:63549,63764,63897-63901,64881
Property changes on: branches/REL1_16/phase3/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
- /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
+ /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
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901
+ /trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901,64881
Modified: branches/REL1_16/phase3/includes/EditPage.php
===================================================================
--- branches/REL1_16/phase3/includes/EditPage.php 2010-04-21 10:59:22 UTC
(rev 65375)
+++ branches/REL1_16/phase3/includes/EditPage.php 2010-04-21 11:06:28 UTC
(rev 65376)
@@ -1286,7 +1286,7 @@
// 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();
}
@@ -1760,7 +1760,11 @@
$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;
Property changes on: branches/REL1_16/phase3/includes/HistoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/PageHistory.php:51646
/trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901
+ /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/LocalisationCache.php
___________________________________________________________________
Modified: svn:mergeinfo
- /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
+ /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
Property changes on: branches/REL1_16/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /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
+ /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/api
___________________________________________________________________
Modified: svn:mergeinfo
- /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
+ /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/diff
___________________________________________________________________
Modified: svn:mergeinfo
- /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
+ /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
___________________________________________________________________
Modified: svn:mergeinfo
- /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
+ /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/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /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
+ /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
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
