From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 14 Dec 2009 23:05:35 +0000 (+0000)
Subject: Update callers from immediateCommit() to commit(). The former's been deprecated a... 
X-Git-Tag: 1.31.0-rc.0~38537
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=b19e37425a66087203a8e6d002fe8405eab162c4;p=lhc%2Fweb%2Fwiklou.git

Update callers from immediateCommit() to commit(). The former's been deprecated a really long time...Tim did it 45243 revisions ago.
---

diff --git a/includes/Article.php b/includes/Article.php
index 20c01c7550..6209041d9b 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1509,7 +1509,7 @@ class Article {
 		if( $wgUseSquid ) {
 			// Commit the transaction before the purge is sent
 			$dbw = wfGetDB( DB_MASTER );
-			$dbw->immediateCommit();
+			$dbw->commit();
 
 			// Send purge
 			$update = SquidUpdate::newSimplePurge( $this->mTitle );
diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index c37e706242..18aa972115 100644
--- a/includes/ExternalStoreDB.php
+++ b/includes/ExternalStoreDB.php
@@ -140,7 +140,7 @@ class ExternalStoreDB {
 			throw new MWException( __METHOD__.': no insert ID' );
 		}
 		if ( $dbw->getFlag( DBO_TRX ) ) {
-			$dbw->immediateCommit();
+			$dbw->commit();
 		}
 		return "DB://$cluster/$id";
 	}
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 179fba5a6a..36f34a3035 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1878,7 +1878,7 @@ abstract class DatabaseBase {
 
 		# Commit any open transactions
 		if ( $this->mTrxLevel ) {
-			$this->immediateCommit();
+			$this->commit();
 		}
 
 		if ( !is_null( $this->mFakeSlaveLag ) ) {
diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index c5ff676f42..902eb77160 100644
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -131,7 +131,7 @@ class DatabaseMssql extends DatabaseBase {
 	function close() {
 		$this->mOpened = false;
 		if ($this->mConn) {
-			if ($this->trxLevel()) $this->immediateCommit();
+			if ($this->trxLevel()) $this->commit();
 			return mssql_close($this->mConn);
 		} else return true;
 	}
diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index 7087220f32..d632e42381 100644
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -129,7 +129,7 @@ class DatabaseMysql extends DatabaseBase {
 		$this->mOpened = false;
 		if ( $this->mConn ) {
 			if ( $this->trxLevel() ) {
-				$this->immediateCommit();
+				$this->commit();
 			}
 			return mysql_close( $this->mConn );
 		} else {
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index d4a2a50a56..ac21539e21 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -79,7 +79,7 @@ class DatabaseSqlite extends DatabaseBase {
 	function close() {
 		$this->mOpened = false;
 		if ( is_object( $this->mConn ) ) {
-			if ( $this->trxLevel() ) $this->immediateCommit();
+			if ( $this->trxLevel() ) $this->commit();
 			$this->mConn = null;
 		}
 		return true;
diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 48065f8046..68d142cba8 100644
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -809,7 +809,7 @@ class LoadBalancer {
 		foreach ( $this->mConns as $conns2 ) {
 			foreach ( $conns2 as $conns3 ) {
 				foreach ( $conns3 as $conn ) {
-					$conn->immediateCommit();
+					$conn->commit();
 				}
 			}
 		}
diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index e0e814f0f2..55c4b17c23 100644
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -937,7 +937,7 @@ class LocalFile extends File
 
 		# Commit the transaction now, in case something goes wrong later
 		# The most important thing is that files don't get lost, especially archives
-		$dbw->immediateCommit();
+		$dbw->commit();
 
 		# Invalidate cache for all pages using this file
 		$update = new HTMLCacheUpdate( $this->getTitle(), 'imagelinks' );