Bugfix: The commit in dba::delete was never executed

diff --git a/include/dba.php b/include/dba.php
index b9d7f71e53dbe32e6181b7d06a1a4e3c99d37e51..3af8522516c64ca9f4306cdff9b836f02302bfac 100644 (file)
--- a/include/dba.php
+++ b/include/dba.php
@@ -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;

diff --git a/include/enotify.php b/include/enotify.php
index e351f0d115c37ec41c5f5bdb842fce45a37de59f..08129da1a51ee20fd3d1e6aec2dff68376b133b2 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -485,9 +485,7 @@ function notification($params) {
                );
                if ($p && (count($p) > 1)) {
                        for ($d = 1; $d < count($p); $d ++) {
-                               q("DELETE FROM `notify` WHERE `id` = %d",
-                                       intval($p[$d]['id'])
-                               );
+                               dba::delete('notify', array('id' => $p[$d]['id']));
                        }
 
                        // only continue on if we stored the first one