From: Edward Date: Wed, 11 Feb 2015 07:53:46 +0000 (+0800) Subject: Import/Core_notify.php X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=c0d7ac89e00ad395b32a36e82a0d1e59298a2602 Import/Core_notify.php --- diff --git a/Import/Core_notify.php b/Import/Core_notify.php index 551d545f..6d0dceeb 100644 --- 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)) ; } }