Browse Source

Fixes for #13457 as commented by @cebe

tags/2.0.11
Alexander Makarov 8 years ago
parent
commit
767400da19
No known key found for this signature in database
GPG Key ID: 3617B79C6A325E4A
  1. 2
      framework/base/Widget.php
  2. 20
      framework/base/WidgetEvent.php

2
framework/base/Widget.php

@ -298,7 +298,7 @@ class Widget extends Component implements ViewContextInterface
{
$event = new WidgetEvent($this);
$event->result = $result;
$this->trigger(self::EVENT_BEFORE_RUN, $event);
$this->trigger(self::EVENT_AFTER_RUN, $event);
return $event->result;
}
}

20
framework/base/WidgetEvent.php

@ -15,12 +15,8 @@ namespace yii\base;
* @author Petra Barus <petra.barus@gmail.com>
* @since 2.0.11
*/
class WidgetEvent extends Event {
/**
* @var Widget the widget currently being executed
*/
public $widget;
class WidgetEvent extends Event
{
/**
* @var mixed the widget result. Event handlers may modify this property to change the widget result.
*/
@ -31,16 +27,4 @@ class WidgetEvent extends Event {
* to continue running the current widget.
*/
public $isValid = true;
/**
* Constructor.
* @param Widget $widget the widget associated with this widget event.
* @param array $config name-value pairs that will be used to initialize the object properties
*/
public function __construct($widget, $config = [])
{
$this->widget = $widget;
parent::__construct($config);
}
}

Loading…
Cancel
Save