diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-07-12 15:14:16 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-07-12 15:14:16 +0000 |
| commit | 9d15ef4f044729f5b7bcede5417ec2c3fcf5c0b4 (patch) | |
| tree | 0c716a2b3f9018f35574999a90546455cd3df259 /includes | |
| parent | 5ac86c1eac20858f7dc870606db5dc7999da7813 (diff) | |
| download | brdo-9d15ef4f044729f5b7bcede5417ec2c3fcf5c0b4.tar.gz brdo-9d15ef4f044729f5b7bcede5417ec2c3fcf5c0b4.tar.bz2 | |
#847528 by chx: Fixed rollback presumes transaction support.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/database/database.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc index 6b878d99f..d2a633d5a 100644 --- a/includes/database/database.inc +++ b/includes/database/database.inc @@ -878,6 +878,9 @@ abstract class DatabaseConnection extends PDO { * @see DatabaseTransaction::rollback() */ public function rollback($savepoint_name = 'drupal_transaction') { + if (!$this->supportsTransactions()) { + return; + } if (!$this->inTransaction()) { throw new DatabaseTransactionNoActiveException(); } @@ -901,9 +904,7 @@ abstract class DatabaseConnection extends PDO { return; } } - if ($this->supportsTransactions()) { - parent::rollBack(); - } + parent::rollBack(); } /** |