Skip to content

Y
yii2
Commit 66a03d61 by Alexander Kochetov
Options

Lost array_merge()

parent ff70e151
Showing with 1 addition and 1 deletion
framework/yii/jui/Tabs.php
...@@ -146,7 +146,7 @@ class Tabs extends Widget ...@@ -146,7 +146,7 @@ class Tabs extends Widget
$url = '#' . $options['id']; $url = '#' . $options['id'];
$items[] = Html::tag($tag, $item['content'], $options); $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); $template = ArrayHelper::getValue($item, 'template', $this->linkTemplate);
$headers[] = Html::tag('li', strtr($template, array( $headers[] = Html::tag('li', strtr($template, array(
'{label}' => $this->encodeLabels ? Html::encode($item['label']) : $item['label'], '{label}' => $this->encodeLabels ? Html::encode($item['label']) : $item['label'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment