Fix yiisoft#19324 by allowing for direct comparison

adnandautovic · Mar 30, 2022 · 8565baa · 8565baa
1 parent f6d3283
commit 8565baa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -11,6 +11,7 @@ Yii Framework 2 Change Log
 - Enh #19304: Add filtering validator `yii\validators\TrimValidator` (WinterSilence)
 - Enh #19309: Optimize `yii\base\Model::attributes()` (WinterSilence)
 - Bug #19322: Revert force setting value to empty string in case it's `null` in `yii\validators\FilterValidator::validateAttribute()` (bizley)
+- Bug #19324: Fix yii\helpers\BaseHtml::renderSelectOptions() giving wrong selection for boolean attributes (adnandautovic)
 - Bug #19329: Fix `yii\web\GroupUrlRule` to properly normalize prefix (bizley)
 
 

diff --git a/framework/helpers/BaseHtml.php b/framework/helpers/BaseHtml.php
@@ -1914,7 +1914,7 @@ public static function renderSelectOptions($selection, $items, &$tagOptions = []
                 $attrs['value'] = (string) $key;
                 if (!array_key_exists('selected', $attrs)) {
                     $attrs['selected'] = $selection !== null &&
-                        (!ArrayHelper::isTraversable($selection) && !strcmp($key, $selection)
+                        (!ArrayHelper::isTraversable($selection) && ($strict ? $selection == $key : !strcmp($key, $selection))
                         || ArrayHelper::isTraversable($selection) && ArrayHelper::isIn((string)$key, $selection, $strict));
                 }
                 $text = $encode ? static::encode($value) : $value;