http://www.mediawiki.org/wiki/Special:Code/MediaWiki/84496
Revision: 84496
Author: platonides
Date: 2011-03-21 22:07:40 +0000 (Mon, 21 Mar 2011)
Log Message:
-----------
MFT r84459 + RELEASE NOTES
Modified Paths:
--------------
branches/REL1_17/phase3/RELEASE-NOTES
branches/REL1_17/phase3/includes/Title.php
Property Changed:
----------------
branches/REL1_17/phase3/RELEASE-NOTES
branches/REL1_17/phase3/includes/Title.php
Modified: branches/REL1_17/phase3/RELEASE-NOTES
===================================================================
--- branches/REL1_17/phase3/RELEASE-NOTES 2011-03-21 22:07:09 UTC (rev
84495)
+++ branches/REL1_17/phase3/RELEASE-NOTES 2011-03-21 22:07:40 UTC (rev
84496)
@@ -500,6 +500,8 @@
* Fix XML well-formedness on a few pages when $wgHtml5 is true (the default)
* (bug 28069) MediaWiki fails streaming files when mod_deflate and ob_gzhandler
are also set.
+* (bug 26223) Concurrently moving an article to different titles leaks a
+ redirect revision with no page.
=== API changes in 1.17 ===
* BREAKING CHANGE: action=patrol now requires POST
Property changes on: branches/REL1_17/phase3/RELEASE-NOTES
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/RELEASE-NOTES:51646
/branches/new-installer/phase3/RELEASE-NOTES:43664-66004
/branches/sqlite/RELEASE-NOTES:58211-58321
/trunk/phase3/HISTORY:79860,80620
/trunk/phase3/RELEASE-NOTES:79166,79324,79454-79456,79536,79557,79727,79733,79746,79773-79774,80109,80113,80163,80222-80223,80322,80324,80326,80328,80339,80350-80351,80355,80358,80362-80363,80371,80442,80475,80492,80540,80554,80575,80608,80620,80656,80666,80679,80685,80694,80728,80841,81121,81124,81186-81187,81197,81209-81211,81215,81238,81246,81262,81264,81430,81488,81496,81554,81561,81589,81600,81611,81620,81622,81640,81648,81650-81652,82810,82813-82815,82818,82845,82847-82848
+ /branches/REL1_15/phase3/RELEASE-NOTES:51646
/branches/new-installer/phase3/RELEASE-NOTES:43664-66004
/branches/sqlite/RELEASE-NOTES:58211-58321
/trunk/phase3/HISTORY:79860,80620
/trunk/phase3/RELEASE-NOTES:79166,79324,79454-79456,79536,79557,79727,79733,79746,79773-79774,80109,80113,80163,80222-80223,80322,80324,80326,80328,80339,80350-80351,80355,80358,80362-80363,80371,80442,80475,80492,80540,80554,80575,80608,80620,80656,80666,80679,80685,80694,80728,80841,81121,81124,81186-81187,81197,81209-81211,81215,81238,81246,81262,81264,81430,81488,81496,81554,81561,81589,81600,81611,81620,81622,81640,81648,81650-81652,82810,82813-82815,82818,82845,82847-82848,84459
Modified: branches/REL1_17/phase3/includes/Title.php
===================================================================
--- branches/REL1_17/phase3/includes/Title.php 2011-03-21 22:07:09 UTC (rev
84495)
+++ branches/REL1_17/phase3/includes/Title.php 2011-03-21 22:07:40 UTC (rev
84496)
@@ -3087,7 +3087,8 @@
}
}
- $pageid = $this->getArticleID();
+ $dbw->begin(); # If $file was a LocalFile, its transaction
would have closed our own.
+ $pageid = $this->getArticleID( GAID_FOR_UPDATE );
$protected = $this->isProtected();
if ( $nt->exists() ) {
$err = $this->moveOverExistingRedirect( $nt, $reason,
$createRedirect );
@@ -3098,6 +3099,8 @@
}
if ( is_array( $err ) ) {
+ # FIXME: What about the File we have already moved?
+ $dbw->rollback();
return $err;
}
$redirid = $this->getArticleID();
@@ -3158,6 +3161,8 @@
$u = new SearchUpdate( $redirid, $this->getPrefixedDBkey(), ''
);
$u->doUpdate();
+ $dbw->commit();
+
# Update site_stats
if ( $this->isContentPage() && !$nt->isContentPage() ) {
# No longer a content page
Property changes on: branches/REL1_17/phase3/includes/Title.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/Title.php:51646
/branches/iwtransclusion/phase3/includes/Title.php:68448,69480
/branches/new-installer/phase3/includes/Title.php:43664-66004
/branches/sqlite/includes/Title.php:58211-58321
/branches/wmf-deployment/includes/Title.php:53381
/trunk/phase3/includes/Title.php:79655,79660,79706,79759,79764,79915,79957,79964,79990,80432,80443,80590,80614-80616,80687,80999,81006,81011,81101,81105,81138,81141,81146,81149-81150,81166,81171
+ /branches/REL1_15/phase3/includes/Title.php:51646
/branches/iwtransclusion/phase3/includes/Title.php:68448,69480
/branches/new-installer/phase3/includes/Title.php:43664-66004
/branches/sqlite/includes/Title.php:58211-58321
/branches/wmf-deployment/includes/Title.php:53381
/trunk/phase3/includes/Title.php:79655,79660,79706,79759,79764,79915,79957,79964,79990,80432,80443,80590,80614-80616,80687,80999,81006,81011,81101,81105,81138,81141,81146,81149-81150,81166,81171,84459
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
