joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Updated to allow for both object variables and explicit module returns to be merged into $__module

Browse source
This commit is contained in:
Josh Sherman 2012-12-08 15:38:05 -05:00
parent bf95e07591
commit 33bbcc014b
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/Controller.php
View file

@ -389,6 +389,10 @@ class Controller extends Object
{ {
$module_return = $module->return; $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)); $display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message));

4
jar.php
View file

@ -1417,6 +1417,10 @@ class Controller extends Object
{ {
$module_return = $module->return; $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)); $display->setModuleReturn(isset($module_return) ? $module_return : array('status' => 'error', 'message' => $error_message));