From 309415f186e92365bce49daafeb902a5d4dead1b Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 4 Sep 2014 14:36:30 -0400
Subject: [PATCH] Fixes #3910: Removed the `container` option from
 `Html::checkbox()` and `Html::radio()`

---
 ActiveField.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/ActiveField.php b/ActiveField.php
index 75890b2..35e1db8 100644
--- a/ActiveField.php
+++ b/ActiveField.php
@@ -248,10 +248,13 @@ class ActiveField extends \yii\widgets\ActiveField
             }
             if (!isset($options['itemOptions'])) {
                 $options['itemOptions'] = [
-                    'container' => false,
                     'labelOptions' => ['class' => 'checkbox-inline'],
                 ];
             }
+        }  elseif (!isset($options['item'])) {
+            $options['item'] = function ($index, $label, $name, $checked, $value) {
+                return '<div class="checkbox">' . Html::checkbox($name, $checked, ['label' => $label, 'value' => $value]) . '</div>';
+            };
         }
         parent::checkboxList($items, $options);
         return $this;
@@ -271,10 +274,13 @@ class ActiveField extends \yii\widgets\ActiveField
             }
             if (!isset($options['itemOptions'])) {
                 $options['itemOptions'] = [
-                    'container' => false,
                     'labelOptions' => ['class' => 'radio-inline'],
                 ];
             }
+        }  elseif (!isset($options['item'])) {
+            $options['item'] = function ($index, $label, $name, $checked, $value) {
+                return '<div class="radio">' . Html::radio($name, $checked, ['label' => $label, 'value' => $value]) . '</div>';
+            };
         }
         parent::radioList($items, $options);
         return $this;