Error202
/
yii2-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Lost array_merge()

tags/2.0.0-beta
Alexander Kochetov 13 years ago
parent
ff70e151d9
commit
66a03d61b6
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      framework/yii/jui/Tabs.php

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

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

Write Preview
Loading…
Cancel
Save