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

Added sanity checking on return type overloading.

Browse source
This commit is contained in:
Josh Sherman 2010-11-14 17:20:26 -05:00
parent eccb07e786
commit 7c7fe769a8
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
classes/Controller.php
View file

@ -166,14 +166,20 @@ class Controller extends Object
}
// Validates the rendering engine
// @todo Need to validate against the module's return type(s)
$engine = $module->engine;
$engines = is_array($module->engine) ? array_values($module->engine) : array($module->engine);
$engines = array_combine($engines, $engines);
$engine = current($engines);
// Possibly overrides the engine with the passed return type
if (isset($return_type))
{
if (in_array(strtolower($return_type), array('json', 'xml'))) // @todo add back rss and possibly atom
$return_type = strtoupper($return_type);
// Validates the return type against the module
// @todo add back rss and possibly add atom as well
if (in_array($return_type, array('JSON', 'XML')) && in_array($return_type, $engines))
{
$engine = strtoupper($return_type);
$engine = $return_type;
}
unset($return_type);