projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24cf76f
)
Import/Core_notify.php
author
Edward
<edward@roojs.com>
Wed, 11 Feb 2015 07:53:46 +0000
(15:53 +0800)
committer
Edward
<edward@roojs.com>
Wed, 11 Feb 2015 07:53:46 +0000
(15:53 +0800)
Import/Core_notify.php
patch
|
blob
|
history
diff --git
a/Import/Core_notify.php
b/Import/Core_notify.php
index
551d545
..
6d0dcee
100644
(file)
--- a/
Import/Core_notify.php
+++ b/
Import/Core_notify.php
@@
-20,6
+20,8
@@
class Pman_Core_Import_Core_notify extends Pman_Roo
}
+ var $defaults = array();
+
function get()
{
@@
-65,8
+67,7
@@
class Pman_Core_Import_Core_notify extends Pman_Roo
continue;
}
- $this->defaults[$m] = json_decode(file_get_contents($file), true);
-
+ $this->defaults = array_merge($this->defaults, json_decode(file_get_contents($file), true)) ;
}
}