From b7012ca9350f22e53c0720fd3c681da0b7c86a14 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Wed, 12 Nov 2014 14:54:03 -0500 Subject: [PATCH] Fixes #5799: `yii\bootstrap\ButtonGroup::buttons` can take all options that are supported by `yii\bootstrap\Button` --- extensions/bootstrap/ButtonGroup.php | 3 ++- extensions/bootstrap/CHANGELOG.md | 1 + framework/CHANGELOG.md | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/bootstrap/ButtonGroup.php b/extensions/bootstrap/ButtonGroup.php index ebbe0a5..91bed41 100644 --- a/extensions/bootstrap/ButtonGroup.php +++ b/extensions/bootstrap/ButtonGroup.php @@ -81,8 +81,9 @@ class ButtonGroup extends Widget foreach ($this->buttons as $button) { if (is_array($button)) { $button['view'] = $this->getView(); - if (!isset($button['encodeLabel'])) + if (!isset($button['encodeLabel'])) { $button['encodeLabel'] = $this->encodeLabels; + } $buttons[] = Button::widget($button); } else { $buttons[] = $button; diff --git a/extensions/bootstrap/CHANGELOG.md b/extensions/bootstrap/CHANGELOG.md index b35eff7..298810e 100644 --- a/extensions/bootstrap/CHANGELOG.md +++ b/extensions/bootstrap/CHANGELOG.md @@ -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) - 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 #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) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 9a64de2..36a1cd3 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -40,6 +40,7 @@ Yii Framework 2 Change Log - Enh #5688: Added optional `$formName` to `Model::loadMultiple()` to support customizing form name directly (qiangxue) - Enh #5735: Added `yii\bootstrap\Tabs::renderTabContent` to support manually rendering tab contents (RomeroMsk) - Enh #5770: Added more PHP error names for `ErrorException` (mongosoft) +- Enh #5799: `yii\bootstrap\ButtonGroup::buttons` can take all options that are supported by `yii\bootstrap\Button` (aleksanderd) - Enh #5806: Allow `Html::encode()` to be used when the application is not started (qiangxue) - Enh #5954: `yii message` command now shows user friendly error if it's not able to parse source file (samdark) - Enh #5983: Added `Inflector::sentence()` (pana1990, qiangxue)