From 33bbcc014bafa2065a2309bbb5bf7c9c879dda12 Mon Sep 17 00:00:00 2001 From: Josh Sherman Date: Sat, 8 Dec 2012 15:38:05 -0500 Subject: [PATCH] Updated to allow for both object variables and explicit module returns to be merged into $__module --- classes/Controller.php | 4 ++++ jar.php | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/classes/Controller.php b/classes/Controller.php index 8d3eaaa..dce6f3e 100644 --- a/classes/Controller.php +++ b/classes/Controller.php @@ -389,6 +389,10 @@ class Controller extends Object { $module_return = $module->return; } + else + { + $module_return = array_merge($module_return, $module->return); + } } $display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message)); diff --git a/jar.php b/jar.php index 5b24eee..76003a6 100755 --- a/jar.php +++ b/jar.php @@ -1417,6 +1417,10 @@ class Controller extends Object { $module_return = $module->return; } + else + { + $module_return = array_merge($module_return, $module->return); + } } $display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message));