From 66a03d61b69289089413a9dee66ef57e92e6ea34 Mon Sep 17 00:00:00 2001 From: Alexander Kochetov Date: Wed, 29 May 2013 04:02:25 +0400 Subject: [PATCH] Lost array_merge() --- framework/yii/jui/Tabs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/yii/jui/Tabs.php b/framework/yii/jui/Tabs.php index c7a4b5a675..d25eaa2618 100644 --- a/framework/yii/jui/Tabs.php +++ b/framework/yii/jui/Tabs.php @@ -146,7 +146,7 @@ class Tabs extends Widget $url = '#' . $options['id']; $items[] = Html::tag($tag, $item['content'], $options); } - $headerOptions = ArrayHelper::getValue($item, 'headerOptions', array()); + $headerOptions = array_merge($this->headerOptions, ArrayHelper::getValue($item, 'headerOptions', array())); $template = ArrayHelper::getValue($item, 'template', $this->linkTemplate); $headers[] = Html::tag('li', strtr($template, array( '{label}' => $this->encodeLabels ? Html::encode($item['label']) : $item['label'],