php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-12-04 00:51:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Lost array_merge()

Browse Source
This commit is contained in:
Alexander Kochetov
2013-05-29 04:02:25 +04:00
parent ff70e151d9
commit 66a03d61b6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/yii/jui/Tabs.php
View File

@@ -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'],