[Fmsystem-commits] [7212] API : Fix missing db-log for errors

[Sigurd Nes]

Revision: 7212
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7212
Author:   sigurdne
Date:     2011-04-12 13:23:45 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
API : Fix missing db-log for errors

Modified Paths:
--------------
    trunk/phpgwapi/inc/class.db_adodb.inc.php
    trunk/phpgwapi/inc/class.db_pdo.inc.php

Modified: trunk/phpgwapi/inc/class.db_adodb.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.db_adodb.inc.php   2011-04-11 21:30:17 UTC (rev 
7211)
+++ trunk/phpgwapi/inc/class.db_adodb.inc.php   2011-04-12 13:23:45 UTC (rev 
7212)
@@ -234,6 +234,7 @@
                        {
                                if ( $e && $this->Halt_On_Error == 'yes' )
                                {
+                                       $this->transaction_abort();
                                        if($file)
                                        {
                                                trigger_error('Error: ' . 
$e->getMessage() . "<br>SQL: $sql\n in File: $file\n on Line: $line\n", 
E_USER_ERROR);
@@ -242,7 +243,6 @@
                                        {
                                                trigger_error("$sql\n". 
$e->getMessage(), E_USER_ERROR);
                                        }
-                                       $this->transaction_abort();
                                        exit;
                                }
                                else if($this->Exception_On_Error)
@@ -286,6 +286,7 @@
                        {
                                if ( $e && $this->Halt_On_Error == 'yes' )
                                {
+                                       $this->transaction_abort();
                                        if($file)
                                        {
                                                trigger_error('Error: ' . 
$e->getMessage() . "<br>SQL: $sql\n in File: $file\n on Line: $line\n", 
E_USER_ERROR);
@@ -294,7 +295,6 @@
                                        {
                                                trigger_error("$sql\n". 
$e->getMessage(), E_USER_ERROR);
                                        }
-                                       $this->transaction_abort();
                                        exit;
                                }
                                else if($this->Exception_On_Error)

Modified: trunk/phpgwapi/inc/class.db_pdo.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.db_pdo.inc.php     2011-04-11 21:30:17 UTC (rev 
7211)
+++ trunk/phpgwapi/inc/class.db_pdo.inc.php     2011-04-12 13:23:45 UTC (rev 
7212)
@@ -360,6 +360,7 @@
                        {
                                if ( $e && $this->Halt_On_Error == 'yes' )
                                {
+                                       $this->transaction_abort();
                                        if($file)
                                        {
                                                trigger_error('Error: ' . 
$e->getMessage() . "<br>SQL: $sql\n in File: $file\n on Line: $line\n", 
E_USER_ERROR);
@@ -368,7 +369,6 @@
                                        {
                                                trigger_error("$sql\n". 
$e->getMessage(), E_USER_ERROR);
                                        }
-                                       $this->transaction_abort();
                                        exit;
                                }
                                else if($this->Exception_On_Error)
@@ -445,6 +445,7 @@
                        {
                                if ( $e && $this->Halt_On_Error == 'yes' )
                                {
+                                       $this->transaction_abort();
                                        if($file)
                                        {
                                                trigger_error('Error: ' . 
$e->getMessage() . "<br>SQL: $sql\n in File: $file\n on Line: $line\n", 
E_USER_ERROR);
@@ -453,7 +454,6 @@
                                        {
                                                trigger_error("$sql\n". 
$e->getMessage(), E_USER_ERROR);
                                        }
-                                       $this->transaction_abort();
                                        exit;
                                }
                                else if($this->Exception_On_Error)