From 0e83f16ff92dd9bf9c0c141fe83a9e68e790053c Mon Sep 17 00:00:00 2001 From: Ruslan Date: Thu, 9 Jul 2015 14:32:28 +0300 Subject: [PATCH 1/2] Fill nested module with parent configuration --- src/Core.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Core.php b/src/Core.php index 8fbd057..c759526 100644 --- a/src/Core.php +++ b/src/Core.php @@ -182,6 +182,10 @@ public function load($path = NULL, $module_id = null, $parameters = array()) // Если в систему был загружен модуль с родительским классом if (get_class($m) == $parent_class) { $connector->parent = & $m; + // Fill nested module with parent configuration + foreach (get_object_vars($m) as $k=>$v){ + $connector->$k = $v; + } //elapsed('Parent connection for '.$moduleClass.'('.$connector->uid.') with '.$parent_class.'('.$m->uid.')'); } } From f3ee32606651ab8e7034c7b801762a9f4ab3a8cb Mon Sep 17 00:00:00 2001 From: Ruslan Date: Thu, 9 Jul 2015 14:49:07 +0300 Subject: [PATCH 2/2] Added checking existing values --- src/Core.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Core.php b/src/Core.php index c759526..91545c5 100644 --- a/src/Core.php +++ b/src/Core.php @@ -184,7 +184,9 @@ public function load($path = NULL, $module_id = null, $parameters = array()) $connector->parent = & $m; // Fill nested module with parent configuration foreach (get_object_vars($m) as $k=>$v){ - $connector->$k = $v; + if (!isset($connector->$k)) { + $connector->$k = $v; + } } //elapsed('Parent connection for '.$moduleClass.'('.$connector->uid.') with '.$parent_class.'('.$m->uid.')'); }