Account for recursive listDeleteAction

Author: pylipp

library/lib/list.php

@@ -148,6 +148,7 @@ function listDelete($table, $ids, $uri = false, $fktables = null, $saveHistory =
     $hasPrevent = db_fieldexists($table, 'preventdelete');
     $hasTree = db_fieldexists($table, 'parent_id');
     $count = 0;
+    $now = date('Y-m-d H:i:s');
 
     try {
         foreach ($ids as $id) {
@@ -182,12 +183,12 @@ function listDelete($table, $ids, $uri = false, $fktables = null, $saveHistory =
                         }
                     }
                 }
-                $count += listDeleteAction($table, $id, 0, $hasTree);
+                $count += listDeleteAction($table, $id, $now, 0, $hasTree);
             } else {
                 $result = db_query('DELETE FROM '.$table.' WHERE id = :id'.($hasPrevent ? ' AND NOT preventdelete' : ''), ['id' => $id]);
                 $count += $result->rowCount();
                 if ($result->rowCount() && $saveHistory) {
-                    simpleSaveChangeHistory($table, $id, 'Record deleted');
+                    simpleSaveChangeHistory($table, $id, 'Record deleted', $now);
                 }
             }
         }
@@ -227,13 +228,12 @@ function listDeleteMessage($table, $id, $foreignkey, $restricted)
     return 'This '.$table_name[$table].' cannot be removed since '.$object_table_name[$foreignkey['TABLE_NAME']].''.$object_name.' '.$id_name.' is still active. Please edit or remove it first!';
 }
 
-function listDeleteAction($table, $id, $count = 0, $recursive = false)
+function listDeleteAction($table, $id, $now, $count = 0, $recursive = false)
 {
     $hasPrevent = db_fieldexists($table, 'preventdelete');
     // prevent deletion of deleted records
     $hasDeleted = db_fieldexists($table, 'deleted');
 
-    $now = date('Y-m-d H:i:s');
     $query = 'UPDATE '.$table.' SET deleted = :now, modified = :now, modified_by = :user_id WHERE id = :id';
     $query .= ($hasPrevent ? ' AND NOT preventdelete' : '');
     $query .= ($hasDeleted ? ' AND (NOT deleted OR deleted IS NULL)' : '');
@@ -250,7 +250,7 @@ function listDeleteAction($table, $id, $count = 0, $recursive = false)
     if ($recursive) {
         $childs = db_array('SELECT id FROM '.$table.' WHERE parent_id = :id'.($hasPrevent ? ' AND NOT preventdelete' : ''), ['id' => $id]);
         foreach ($childs as $child) {
-            $count += listDeleteAction($table, $child['id'], $count, true);
+            $count += listDeleteAction($table, $child['id'], $now, $count, true);
         }
     }