| Index: branches/REL1_17/phase3/includes/Title.php |
| — | — | @@ -3087,7 +3087,8 @@ |
| 3088 | 3088 | } |
| 3089 | 3089 | } |
| 3090 | 3090 | |
| 3091 | | - $pageid = $this->getArticleID(); |
| | 3091 | + $dbw->begin(); # If $file was a LocalFile, its transaction would have closed our own. |
| | 3092 | + $pageid = $this->getArticleID( GAID_FOR_UPDATE ); |
| 3092 | 3093 | $protected = $this->isProtected(); |
| 3093 | 3094 | if ( $nt->exists() ) { |
| 3094 | 3095 | $err = $this->moveOverExistingRedirect( $nt, $reason, $createRedirect ); |
| — | — | @@ -3098,6 +3099,8 @@ |
| 3099 | 3100 | } |
| 3100 | 3101 | |
| 3101 | 3102 | if ( is_array( $err ) ) { |
| | 3103 | + # FIXME: What about the File we have already moved? |
| | 3104 | + $dbw->rollback(); |
| 3102 | 3105 | return $err; |
| 3103 | 3106 | } |
| 3104 | 3107 | $redirid = $this->getArticleID(); |
| — | — | @@ -3158,6 +3161,8 @@ |
| 3159 | 3162 | $u = new SearchUpdate( $redirid, $this->getPrefixedDBkey(), '' ); |
| 3160 | 3163 | $u->doUpdate(); |
| 3161 | 3164 | |
| | 3165 | + $dbw->commit(); |
| | 3166 | + |
| 3162 | 3167 | # Update site_stats |
| 3163 | 3168 | if ( $this->isContentPage() && !$nt->isContentPage() ) { |
| 3164 | 3169 | # No longer a content page |
| Property changes on: branches/REL1_17/phase3/includes/Title.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3165 | 3170 | Merged /trunk/phase3/includes/Title.php:r84459 |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -500,6 +500,8 @@ |
| 501 | 501 | * Fix XML well-formedness on a few pages when $wgHtml5 is true (the default) |
| 502 | 502 | * (bug 28069) MediaWiki fails streaming files when mod_deflate and ob_gzhandler |
| 503 | 503 | are also set. |
| | 504 | +* (bug 26223) Concurrently moving an article to different titles leaks a |
| | 505 | + redirect revision with no page. |
| 504 | 506 | |
| 505 | 507 | === API changes in 1.17 === |
| 506 | 508 | * BREAKING CHANGE: action=patrol now requires POST |
| Property changes on: branches/REL1_17/phase3/RELEASE-NOTES |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 507 | 509 | Merged /trunk/phase3/RELEASE-NOTES:r84459 |