From: Platonides <platonides@users.mediawiki.org>
Date: Fri, 10 Sep 2010 20:31:44 +0000 (+0000)
Subject: (Bug 25138) ApiUndelete begins a transaction, but does not commit.
X-Git-Tag: 1.31.0-rc.0~35042
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=d8b8075cc0dac4e2375890bc843c155b961755e6;p=lhc%2Fweb%2Fwiklou.git

(Bug 25138) ApiUndelete begins a transaction, but does not commit.
The UI doesn't use a transaction either, although it seems appropiate.
The begin() should be moved into PageArchive::undelete()
---

diff --git a/includes/api/ApiUndelete.php b/includes/api/ApiUndelete.php
index d081d0d75f..83c3fbe59a 100644
--- a/includes/api/ApiUndelete.php
+++ b/includes/api/ApiUndelete.php
@@ -69,8 +69,6 @@ class ApiUndelete extends ApiBase {
 		}
 
 		$pa = new PageArchive( $titleObj );
-		$dbw = wfGetDB( DB_MASTER );
-		$dbw->begin();
 		$retval = $pa->undelete( ( isset( $params['timestamps'] ) ? $params['timestamps'] : array() ), $params['reason'] );
 		if ( !is_array( $retval ) ) {
 			$this->dieUsageMsg( array( 'cannotundelete' ) );