Merge branch 'develop' into pr/multidomain

This commit is contained in:
Kijin Sung 2017-03-01 21:50:51 +09:00
commit 210b6b4147
75 changed files with 2102 additions and 425 deletions

View file

@ -449,7 +449,7 @@ class moduleModel extends module
if(!$output->toBool()) return $output;
$list = $output->data;
if(count($args) === 1 && isset($args->site_srl))
if(count($args) === 1 && isset($args->site_srl) && !$columnList)
{
Rhymix\Framework\Cache::set('site_and_module:module:mid_list_' . $args->site_srl, $list, 0, true);
}