diff options
Diffstat (limited to 'phpBB/db/msaccess.php')
| -rw-r--r-- | phpBB/db/msaccess.php | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/phpBB/db/msaccess.php b/phpBB/db/msaccess.php index a2ae1a32a5..fe45540be2 100644 --- a/phpBB/db/msaccess.php +++ b/phpBB/db/msaccess.php @@ -94,7 +94,7 @@ class sql_db { $this->num_queries++; - if( $transaction == BEGIN_TRANSACTION ) + if( $transaction == BEGIN_TRANSACTION && !$this->in_transaction ) { if( !odbc_autocommit($this->db_connect_id, false) ) { @@ -195,16 +195,35 @@ class sql_db if( $transaction == END_TRANSACTION && $this->in_transaction ) { - odbc_commit($this->db_connect_id); - odbc_autocommit($this->db_connect_id, true); $this->in_transaction = FALSE; + + if ( !@odbc_commit($this->db_connect_id) ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + return false; + } + odbc_autocommit($this->db_connect_id, true); } return $this->result; } else { - return false; + if( $transaction == END_TRANSACTION && $this->in_transaction ) + { + $this->in_transaction = FALSE; + + if ( !@odbc_commit($this->db_connect_id) ) + { + odbc_rollback($this->db_connect_id); + odbc_autocommit($this->db_connect_id, true); + return false; + } + odbc_autocommit($this->db_connect_id, true); + } + + return true; } } |