getActionForward() 에서 값이 없을 경우 빈 리턴을 하도록 개선

rss 모듈의 action forward가 등록되지 않는 문제 수정 (기존 서드파티에도 같은 문제가 발생될 것 같아 이렇게 수정함)
This commit is contained in:
conory 2018-06-21 16:13:03 +09:00
parent 89fcea58c9
commit bacca5d025
2 changed files with 14 additions and 16 deletions

View file

@ -567,10 +567,12 @@ class moduleModel extends module
if($action_forward === null)
{
$args = new stdClass();
$output = executeQueryArray('module.getActionForward',$args);
if(!$output->toBool()) return new stdClass;
if(!$output->data) $output->data = array();
$output = executeQueryArray('module.getActionForward', $args);
if(!$output->toBool())
{
return;
}
$action_forward = array();
foreach($output->data as $item)
{
@ -579,15 +581,13 @@ class moduleModel extends module
Rhymix\Framework\Cache::set('action_forward', $action_forward, 0, true);
}
if($action_forward[$act])
if(!isset($action_forward[$act]))
{
return $action_forward[$act];
}
else
{
return new stdClass();
return;
}
return $action_forward[$act];
}
/**