Merge branch 'master' of gitorious.org:owncloud/owncloud into migration

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/db.php b/lib/db.php
index 4860651b323..9d3c20e0145 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -35,6 +35,7 @@ class OC_DB {
 	static private $schema=false;
 	static private $affected=0;
 	static private $result=false;
+	static private $inTransaction=false;
 
 	/**
 	 * @brief connects to the database
@@ -486,21 +487,23 @@ class OC_DB {
 	 */
 	public static function beginTransaction(){
 		self::connect();
-		if (self::$backend=self::BACKEND_MDB2 && !self::$connection->supports('transactions')) {
+		if (self::$backend==self::BACKEND_MDB2 && !self::$connection->supports('transactions')) {
 			return false;
 		}
 		self::$connection->beginTransaction();
+		self::$inTransaction=true;
 	}
 
 	/**
 	 * Commit the database changes done during a transaction that is in progress
 	 */
-	public static function commit($savePoint=''){
+	public static function commit(){
 		self::connect();
-		if(!self::$connection->inTransaction()){
+		if(!self::$inTransaction){
 			return false;
 		}
 		self::$connection->commit();
+		self::$inTransaction=false;
 	}
 }