Merge pull request #4120 from Alex-Code/encodeLabel

extensions/bootstrap/CHANGELOG.md

@@ -9,6 +9,7 @@ Yii Framework 2 bootstrap extension Change Log
 - Bug #3749: Fixed invalid plugin registration and ensure clickable links in dropdown (kartik-v)
 - Enh #4024: Added ability to `yii\bootstrap\Tabs` to encode each `Tabs::items['label']` separately (creocoder, umneeq)
 - Chg #3036: Upgraded Twitter Bootstrap to 3.1.x (qiangxue)
+- Enh #4120: Added ability for each item to choose it's encoding option in `Dropdown` and `Nav` (Alex-Code)
 
 2.0.0-beta April 13, 2014
 -------------------------

extensions/bootstrap/Dropdown.php

@@ -80,7 +80,8 @@ class Dropdown extends Widget
             if (!isset($item['label'])) {
                 throw new InvalidConfigException("The 'label' option is required.");
             }
-            $label = $this->encodeLabels ? Html::encode($item['label']) : $item['label'];
+            $encodeLabel = isset($item['encode']) ? $item['encode'] : $this->encodeLabels;
+            $label = $encodeLabel ? Html::encode($item['label']) : $item['label'];
             $options = ArrayHelper::getValue($item, 'options', []);
             $linkOptions = ArrayHelper::getValue($item, 'linkOptions', []);
             $linkOptions['tabindex'] = '-1';

extensions/bootstrap/Nav.php

@@ -148,7 +148,8 @@ class Nav extends Widget
         if (!isset($item['label'])) {
             throw new InvalidConfigException("The 'label' option is required.");
         }
-        $label = $this->encodeLabels ? Html::encode($item['label']) : $item['label'];
+        $encodeLabel = isset($item['encode']) ? $item['encode'] : $this->encodeLabels;
+        $label = $encodeLabel ? Html::encode($item['label']) : $item['label'];
         $options = ArrayHelper::getValue($item, 'options', []);
         $items = ArrayHelper::getValue($item, 'items');
         $url = ArrayHelper::getValue($item, 'url', '#');