From b9d20fdeac0720ec73c7db8644775d0c9be8a6b9 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
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`

---
 ButtonGroup.php | 3 ++-
 CHANGELOG.md    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ButtonGroup.php b/ButtonGroup.php
index ebbe0a5..91bed41 100644
--- a/ButtonGroup.php
+++ b/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/CHANGELOG.md b/CHANGELOG.md
index b35eff7..298810e 100644
--- a/CHANGELOG.md
+++ b/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)