Commit b9d20fde authored by Qiang Xue's avatar Qiang Xue

Fixes #5799: `yii\bootstrap\ButtonGroup::buttons` can take all options that...

Fixes #5799: `yii\bootstrap\ButtonGroup::buttons` can take all options that are supported by `yii\bootstrap\Button`
parent 2888d982
...@@ -81,8 +81,9 @@ class ButtonGroup extends Widget ...@@ -81,8 +81,9 @@ class ButtonGroup extends Widget
foreach ($this->buttons as $button) { foreach ($this->buttons as $button) {
if (is_array($button)) { if (is_array($button)) {
$button['view'] = $this->getView(); $button['view'] = $this->getView();
if (!isset($button['encodeLabel'])) if (!isset($button['encodeLabel'])) {
$button['encodeLabel'] = $this->encodeLabels; $button['encodeLabel'] = $this->encodeLabels;
}
$buttons[] = Button::widget($button); $buttons[] = Button::widget($button);
} else { } else {
$buttons[] = $button; $buttons[] = $button;
......
...@@ -7,6 +7,7 @@ Yii Framework 2 bootstrap extension Change Log ...@@ -7,6 +7,7 @@ Yii Framework 2 bootstrap extension Change Log
- Bug #5570: `yii\bootstrap\Tabs` would throw an exception if `content` is not set for one of its `items` (RomeroMsk) - Bug #5570: `yii\bootstrap\Tabs` would throw an exception if `content` is not set for one of its `items` (RomeroMsk)
- Enh #4181: Added `yii\bootstrap\Modal::$headerOptions` and `yii\bootstrap\Modal::$footerOptions` (tuxoff, samdark) - Enh #4181: Added `yii\bootstrap\Modal::$headerOptions` and `yii\bootstrap\Modal::$footerOptions` (tuxoff, samdark)
- Enh #5735: Added `yii\bootstrap\Tabs::renderTabContent` to support manually rendering tab contents (RomeroMsk) - Enh #5735: Added `yii\bootstrap\Tabs::renderTabContent` to support manually rendering tab contents (RomeroMsk)
- Enh #5799: `yii\bootstrap\ButtonGroup::buttons` can take all options that are supported by `yii\bootstrap\Button` (aleksanderd)
- Chg #5874: Upgraded Twitter Bootstrap to 3.3.x (samdark) - Chg #5874: Upgraded Twitter Bootstrap to 3.3.x (samdark)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment