Merge pull request #4299 from owncloud/simplify-db-transaction

Simplify OC_DB transaction functions

1 files changed, 0 insertions, 10 deletions

diff --git a/lib/db.php b/lib/db.php
index dd48c329490..311cdcfecf5 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -56,7 +56,6 @@ class OC_DB {
 	 */
 	static private $DOCTRINE=null;
 
-	static private $inTransaction=false;
 	static private $prefix=null;
 	static private $type=null;
 
@@ -624,27 +623,18 @@ class OC_DB {
 
 	/**
 	 * Start a transaction
-	 * @return bool
 	 */
 	public static function beginTransaction() {
 		self::connect();
 		self::$connection->beginTransaction();
-		self::$inTransaction=true;
-		return true;
 	}
 
 	/**
 	 * Commit the database changes done during a transaction that is in progress
-	 * @return bool
 	 */
 	public static function commit() {
 		self::connect();
-		if(!self::$inTransaction) {
-			return false;
-		}
 		self::$connection->commit();
-		self::$inTransaction=false;
-		return true;
 	}
 
 	/**