From f05e8025168f251389d9df78d6d4422855bf1930 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 21 Apr 2015 12:00:08 +0800 Subject: [PATCH] DataObjects/Events.php --- DataObjects/Events.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/DataObjects/Events.php b/DataObjects/Events.php index df213e40..d878b82a 100644 --- a/DataObjects/Events.php +++ b/DataObjects/Events.php @@ -409,31 +409,30 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $this->writeEventLog(); } - function deletedRecord($obj = false, $reset = false) + static $deleted = array(); + + function logDeletedRecord($obj = false, $reset = false) { - static $deleted; if(!empty($reset)){ - $deleted = array(); + self::$deleted = array(); } - if(!empty($deleted)){ - return $deleted; - } if (is_array($obj)) { foreach($obj as $o) { - $this->deletedRecord($o); + $this->logDeletedRecord($o); } return; } if(empty($obj) || !is_a($obj, 'DB_DataObject')){ - return $deleted; + return $self::$deleted; } - $deleted = $obj->toArray(); - $deleted['_table'] = $obj->tableName(); + + $del = $obj->toArray(); + $del['_table'] = $obj->tableName(); if(method_exists($obj, 'toDeletedArray')){ $deleted = $obj->toDeletedArray(); -- 2.39.2