From 0d34aab0ab8bf27d27f01d248a37acfce7a3d332 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Fri, 31 May 2013 18:54:13 +0200 Subject: [PATCH] added missing default to getValue in boostrap tabs fixes #465 --- framework/yii/bootstrap/Tabs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/yii/bootstrap/Tabs.php b/framework/yii/bootstrap/Tabs.php index a18eef6247..4a85b9aa5c 100644 --- a/framework/yii/bootstrap/Tabs.php +++ b/framework/yii/bootstrap/Tabs.php @@ -132,7 +132,7 @@ class Tabs extends Widget $header = Html::a($label, "#", array('class' => 'dropdown-toggle', 'data-toggle' => 'dropdown')) . "\n" . Dropdown::widget(array('items' => $item['items'], 'clientOptions' => false)); } elseif (isset($item['content'])) { - $options = array_merge($this->itemOptions, ArrayHelper::getValue($item, 'options')); + $options = array_merge($this->itemOptions, ArrayHelper::getValue($item, 'options', array())); $options['id'] = ArrayHelper::getValue($options, 'id', $this->options['id'] . '-tab' . $n); $this->addCssClass($options, 'tab-pane');