From 4c84a919caaf6cfe8aff5c13f6d174eee2f36f21 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Tue, 24 Jun 2014 02:43:42 +0400 Subject: [PATCH] Fixes #4024, Fixes #4028 --- Tabs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tabs.php b/Tabs.php index 93c2b0c..a618df5 100644 --- a/Tabs.php +++ b/Tabs.php @@ -138,7 +138,7 @@ class Tabs extends Widget if (!isset($item['label'])) { throw new InvalidConfigException("The 'label' option is required."); } - $encodeLabel = $this->encodeLabels || isset($item['encode']) && $item['encode'] === true; + $encodeLabel = isset($item['encode']) ? $item['encode'] : $this->encodeLabels; $label = $encodeLabel ? Html::encode($item['label']) : $item['label']; $headerOptions = array_merge($this->headerOptions, ArrayHelper::getValue($item, 'headerOptions', [])); $linkOptions = array_merge($this->linkOptions, ArrayHelper::getValue($item, 'linkOptions', []));