Merge branch 'feature/object-cache' of https://github.com/xpressengine/xe-core into feature/object-cache

Conflicts:
	modules/module/module.model.php
This commit is contained in:
bnu 2014-01-08 13:40:06 +09:00
commit df697c7234

View file

@ -1703,7 +1703,6 @@ class moduleModel extends module
$args = new stdClass();
$args->module_srl = implode(',', $get_module_srls);
$output = executeQueryArray('module.getModuleExtraVars', $args);
if(!$output->toBool())
{
return;