X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FDatabase%2FDBA.php;h=ab856ef9d05da6fd2c1205fcf07e2029d8fdce02;hb=1fe55679fc06af36fabfee4758adb6c2dc3241b9;hp=bf480dad2c769ce0dce42c2f22878958c25536f5;hpb=dc3d2d598820d7a8682f55dd0d84a8f6ecabaaa1;p=friendica.git

diff --git a/src/Database/DBA.php b/src/Database/DBA.php
index bf480dad2c..ab856ef9d0 100644
--- a/src/Database/DBA.php
+++ b/src/Database/DBA.php
@@ -91,6 +91,7 @@ class DBA
 				self::$connection->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
 				self::$connected = true;
 			} catch (PDOException $e) {
+				/// @TODO At least log exception, don't ignore it!
 			}
 		}
 
@@ -255,6 +256,7 @@ class DBA
 			switch (self::$driver) {
 				case 'pdo':
 					return substr(@self::$connection->quote($str, PDO::PARAM_STR), 1, -1);
+
 				case 'mysqli':
 					return @self::$connection->real_escape_string($str);
 			}
@@ -932,13 +934,11 @@ class DBA
 
 		switch (self::$driver) {
 			case 'pdo':
-				if (self::$connection->inTransaction()) {
-					break;
-				}
-				if (!self::$connection->beginTransaction()) {
+				if (!self::$connection->inTransaction() && !self::$connection->beginTransaction()) {
 					return false;
 				}
 				break;
+
 			case 'mysqli':
 				if (!self::$connection->begin_transaction()) {
 					return false;
@@ -957,10 +957,13 @@ class DBA
 				if (!self::$connection->inTransaction()) {
 					return true;
 				}
+
 				return self::$connection->commit();
+
 			case 'mysqli':
 				return self::$connection->commit();
 		}
+
 		return true;
 	}
 
@@ -993,6 +996,7 @@ class DBA
 				}
 				$ret = self::$connection->rollBack();
 				break;
+
 			case 'mysqli':
 				$ret = self::$connection->rollback();
 				break;