php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 06:37:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better code for #6106

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/CHANGELOG.md
View File

@ -21,7 +21,7 @@ Yii Framework 2 Change Log
- Bug #6736: Removed `Content-Transfer-Encoding` from the list of default download headers (DaSourcerer) - Bug #6736: Removed `Content-Transfer-Encoding` from the list of default download headers (DaSourcerer)
- Enh #4502: Added alias support to URL route when calling `Url::toRoute()` and `Url::to()` (qiangxue, lynicidn) - Enh #4502: Added alias support to URL route when calling `Url::toRoute()` and `Url::to()` (qiangxue, lynicidn)
- Enh #5194: `yii\console\controllers\AssetController` now handles bundle files from external resources properly (klimov-paul) - Enh #5194: `yii\console\controllers\AssetController` now handles bundle files from external resources properly (klimov-paul)
- Enh #6106: Added ability to specify `encode` for each item of `yii\widgets\Breadcrumbs` (samdark) - Enh #6106: Added ability to specify `encode` for each item of `yii\widgets\Breadcrumbs` (samdark, aleksanderd)
- Enh #6247: Logger and error handler are now using slightly less memory (stepanselyuk, samdark) - Enh #6247: Logger and error handler are now using slightly less memory (stepanselyuk, samdark)
- Enh #6398: Added support for specifying dependent component in terms of a configuration array for classes such as `DbCache` (qiangxue) - Enh #6398: Added support for specifying dependent component in terms of a configuration array for classes such as `DbCache` (qiangxue)
- Enh #6434: Added `yii\behaviors\SluggableBehavior::immutable` to support keeping the generated slug unchanged (trntv) - Enh #6434: Added `yii\behaviors\SluggableBehavior::immutable` to support keeping the generated slug unchanged (trntv)

8
framework/widgets/Breadcrumbs.php
View File

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