opps, re-introduced this out-dated code by mistake

[friendica.git] / include / dba.php

diff --git a/include/dba.php b/include/dba.php
index 39eb1f460744ee3408ce2d303dc3e64215a9d9aa..3af8522516c64ca9f4306cdff9b836f02302bfac 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -22,7 +22,7 @@ class dba {
        public  $connected = false;
        public  $error = false;
        private $_server_info = '';
-       private $in_transaction = false;
+       private static $in_transaction = false;
        private static $dbo;
        private static $relation = array();
 
@@ -845,7 +845,7 @@ class dba {
        }
 
        /**
-        * @brief Insert a row into a table
+        * @brief Delete a row from a table
         *
         * @param string $table Table name
         * @param array $param parameter array
@@ -918,7 +918,9 @@ class dba {
 
                if (!$in_process) {
                        // Now we finalize the process
-                       if (!self::$in_transaction) {
+                       $do_transaction = !self::$in_transaction;
+
+                       if ($do_transaction) {
                                self::transaction();
                        }
 
@@ -932,7 +934,7 @@ class dba {
                                        logger(dba::replace_parameters($sql, $command['param']), LOGGER_DATA);
 
                                        if (!self::e($sql, $command['param'])) {
-                                               if (!self::$in_transaction) {
+                                               if ($do_transaction) {
                                                        self::rollback();
                                                }
                                                return false;
@@ -962,7 +964,7 @@ class dba {
                                                logger(dba::replace_parameters($sql, $field_values), LOGGER_DATA);
 
                                                if (!self::e($sql, $field_values)) {
-                                                       if (!self::$in_transaction) {
+                                                       if ($do_transaction) {
                                                                self::rollback();
                                                        }
                                                        return false;
@@ -970,7 +972,7 @@ class dba {
                                        }
                                }
                        }
-                       if (!self::$in_transaction) {
+                       if ($do_transaction) {
                                self::commit();
                        }
                        return true;