projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
be35056
)
DataObjects/Events.php
author
Edward
<edward@roojs.com>
Fri, 17 Apr 2015 09:19:12 +0000
(17:19 +0800)
committer
Edward
<edward@roojs.com>
Fri, 17 Apr 2015 09:19:12 +0000
(17:19 +0800)
DataObjects/Events.php
patch
|
blob
|
history
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
8e706b1
..
32b3b9c
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-417,7
+417,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$deleted = array();
}
- if(empty($set) ||
(empty($obj) && !is_a($obj, 'DB_DataObject')
)){
+ if(empty($set) ||
empty($obj) || !is_a($obj, 'DB_DataObject'
)){
return $deleted;
}
@@
-427,7
+427,6
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$d = $obj->toDeletedArray();
}
-
$deleted = array_merge($deleted, $d);
return $deleted;