Merge pull request #1265 from izuzero/develop.14

없는 트리거를 반환할 때 foreach 구문 사용 문제 해결
This commit is contained in:
bnu 2015-03-23 19:53:05 +09:00
commit d82ec5293f

View file

@ -662,11 +662,14 @@ class moduleModel extends module
function getTrigger($trigger_name, $module, $type, $called_method, $called_position) function getTrigger($trigger_name, $module, $type, $called_method, $called_position)
{ {
$triggers = $this->getTriggers($trigger_name, $called_position); $triggers = $this->getTriggers($trigger_name, $called_position);
foreach($triggers as $item) if($triggers && is_object($triggers))
{ {
if($item->module == $module && $item->type == $type && $item->called_method == $called_method) foreach($triggers as $item)
{ {
return $item; if($item->module == $module && $item->type == $type && $item->called_method == $called_method)
{
return $item;
}
} }
} }