Browse Source

Fixed public property naming.

tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
c6ecf4f2de
  1. 12
      framework/yii/base/Widget.php

12
framework/yii/base/Widget.php

@ -27,13 +27,13 @@ class Widget extends Component implements ViewContextInterface
* @var integer a counter used to generate [[id]] for widgets. * @var integer a counter used to generate [[id]] for widgets.
* @internal * @internal
*/ */
public static $_counter = 0; public static $counter = 0;
/** /**
* @var Widget[] the widgets that are currently being rendered (not ended). This property * @var Widget[] the widgets that are currently being rendered (not ended). This property
* is maintained by [[begin()]] and [[end()]] methods. * is maintained by [[begin()]] and [[end()]] methods.
* @internal * @internal
*/ */
public static $_stack = []; public static $stack = [];
/** /**
@ -48,7 +48,7 @@ class Widget extends Component implements ViewContextInterface
$config['class'] = get_called_class(); $config['class'] = get_called_class();
/** @var Widget $widget */ /** @var Widget $widget */
$widget = Yii::createObject($config); $widget = Yii::createObject($config);
self::$_stack[] = $widget; self::$stack[] = $widget;
return $widget; return $widget;
} }
@ -60,8 +60,8 @@ class Widget extends Component implements ViewContextInterface
*/ */
public static function end() public static function end()
{ {
if (!empty(self::$_stack)) { if (!empty(self::$stack)) {
$widget = array_pop(self::$_stack); $widget = array_pop(self::$stack);
if (get_class($widget) === get_called_class()) { if (get_class($widget) === get_called_class()) {
$widget->run(); $widget->run();
return $widget; return $widget;
@ -100,7 +100,7 @@ class Widget extends Component implements ViewContextInterface
public function getId($autoGenerate = true) public function getId($autoGenerate = true)
{ {
if ($autoGenerate && $this->_id === null) { if ($autoGenerate && $this->_id === null) {
$this->_id = 'w' . self::$_counter++; $this->_id = 'w' . self::$counter++;
} }
return $this->_id; return $this->_id;
} }

Loading…
Cancel
Save