Better code for #6106

This commit is contained in:
Alexander Makarov
2015-01-11 15:16:05 +08:00
parent 440eeea8cc
commit e4cf948c0b
2 changed files with 3 additions and 7 deletions

View File

@ -10,6 +10,7 @@ namespace yii\widgets;
use Yii;
use yii\base\Widget;
use yii\base\InvalidConfigException;
use yii\helpers\ArrayHelper;
use yii\helpers\Html;
/**
@ -159,12 +160,7 @@ class Breadcrumbs extends Widget
*/
protected function renderItem($link, $template)
{
$encodeLabel = $this->encodeLabels;
if (array_key_exists('encode', $link)) {
$encodeLabel = $link['encode'];
unset($link['encode']);
}
$encodeLabel = $encode = ArrayHelper::remove($link, 'encode', $this->encodeLabels);
if (array_key_exists('label', $link)) {
$label = $encodeLabel ? Html::encode($link['label']) : $link['label'];
} else {