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

Fixes #5424: Html::addCssStyle() wasn't correctly setting style passed in array

Browse Source
This commit is contained in:
Kartik Visweswaran
2014-10-08 14:37:50 +05:30
committed by Alexander Makarov
parent 1b6431f4ee
commit 03b88dd618
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
framework/CHANGELOG.md
View File

@ -10,6 +10,7 @@ Yii Framework 2 Change Log
- Bug #5323: Nested dropdown does not work for `yii\bootstrap\DropDown` (aryraditya)
- Bug #5336: `yii\bootstrap\DropDown` should register bootstrap plugin asset (zelenin)
- Bug #5379: `Module::afterAction()` was called even when `beforeAction()` returned false (cebe)
- Bug #5424: `Html::addCssStyle()` wasn't correctly setting style passed in array (kartik-v, samdark)
- Bug: Date and time formatting now assumes UTC as the timezone for input dates unless a timezone is explicitly given (cebe)
- Enh #4040: Added `$viewFile` and `$params` to the `EVENT_BEFORE_RENDER` and `EVENT_AFTER_RENDER` events for `View` (qiangxue)
- Enh #4275: Added `removeChildren()` to `yii\rbac\ManagerInterface` and implementations (samdark)

4
framework/helpers/BaseHtml.php
View File

@ -1703,9 +1703,9 @@ class BaseHtml
}
}
}
$style = static::cssStyleFromArray(array_merge($oldStyle, $newStyle));
$style = array_merge($oldStyle, $newStyle);
}
$options['style'] = $style;
$options['style'] = is_array($style) ? static::cssStyleFromArray($style) : $style;
}
/**