Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions framework/yii/base/Component.php
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ public function off($name, $handler = null)
* all attached handlers for the event.
* @param string $name the event name
* @param Event $event the event parameter. If not set, a default [[Event]] object will be created.
* @return mix Result that attached handlers
*/
public function trigger($name, $event = null)
{
Expand All @@ -450,14 +451,18 @@ public function trigger($name, $event = null)
$event->name = $name;
foreach ($this->_events[$name] as $handler) {
$event->data = $handler[1];
call_user_func($handler[0], $event);
$returnedEvent = call_user_func($handler[0], $event);
if ($returnedEvent instanceof Event) {
$event = $returnedEvent;
}
// stop further handling if the event is handled
if ($event instanceof Event && $event->handled) {
return;
return $event;
}
}
}
Event::trigger($this, $name, $event);
return $event;
}

/**
Expand Down