Skip to content

Commit

Permalink
Merge pull request #3880 from AloneCoder/3879-preserve_numeric_keys_i…
Browse files Browse the repository at this point in the history
…n_breadcrumbs

Fixed #3879
  • Loading branch information
cebe committed Jun 2, 2015
2 parents 54faf0c + afad205 commit 04dfe87
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG
Expand Up @@ -21,6 +21,7 @@ Version 1.1.17 work in progress
- Enh #3827: Added the $options parameter to be used in stream_socket_client in CRedisCache.
- Chg #3776: Autoloader now doesn't error in case of non-existing namespaced classes so other autoloaders have chance to handle these (alexandernst)
- Bug #3869: jQuery Yii GridView now doesn't fail when refreshing grid via POST request (a-t)
- Bug #3879: Numeric labels in CBreadCrumbs reindex after using array_merge (AloneCoder)

Version 1.1.16 December 21, 2014
--------------------------------
Expand Down
2 changes: 1 addition & 1 deletion framework/zii/widgets/CBreadcrumbs.php
Expand Up @@ -115,7 +115,7 @@ public function run()
echo CHtml::openTag($this->tagName,$this->htmlOptions)."\n";
$links=array();
if($this->homeLink===null)
$definedLinks=array_merge(array(Yii::t('zii','Home') => Yii::app()->homeUrl),$definedLinks);
$definedLinks=array(Yii::t('zii','Home') => Yii::app()->homeUrl)+$definedLinks;
elseif($this->homeLink!==false)
$links[]=$this->homeLink;
foreach($definedLinks as $label=>$url)
Expand Down

0 comments on commit 04dfe87

Please sign in to comment.