projects
/
Pman.MTrack
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
77b5624
)
DataObjects/Mtrack_change.php
author
Alan Knowles
<alan@roojs.com>
Wed, 14 Nov 2018 02:19:52 +0000
(10:19 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 14 Nov 2018 02:19:52 +0000
(10:19 +0800)
DataObjects/Mtrack_change.php
patch
|
blob
|
history
diff --git
a/DataObjects/Mtrack_change.php
b/DataObjects/Mtrack_change.php
index
4adfc56
..
590e5f1
100644
(file)
--- a/
DataObjects/Mtrack_change.php
+++ b/
DataObjects/Mtrack_change.php
@@
-664,7
+664,7
@@
class Pman_MTrack_DataObjects_Mtrack_change extends DB_DataObject
");
$hours = $ie->fetchAll(false,false,'toArray');
- return
$data + $hours
;
+ return
array_merge($data , $hours)
;