diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 2e16da47cc..0aa0e4b5e5 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -57,7 +57,7 @@ Yii Framework 2 Change Log - Enh #9901: Default `Cache.SerializerPermissions` configuration option for `HTMLPurifier` is set to `0775` (klimov-paul) - Enh #10056: Allowed any callable to be passed to `ActionColumn::$urlCreator` (freezy-sk) - Enh #10061: `yii\helpers\BaseInflector::transliterate()` is now public. Introduced different levels of transliteration strictness (silverfire) -- Enh #10078: Added `csrf` option to `Html::beginForm()` to allow disabling the hidden csrf field generation. (machour) +- Enh #10078: Added `csrf` option to `Html::beginForm()` to allow disabling the hidden csrf field generation (machour) - Enh #10098: Changed `yii.confirm` context to the event's target DOM element which is triggered by clickable or changeable elements (lichunqiang) - Enh #10118: Allow easy extension of slug generation in `yii\behaviors\SluggableBehavior` (cebe, hesna) - Enh #10149: Made `yii\db\Connection` serializable (Sam Mousa) diff --git a/framework/helpers/BaseHtml.php b/framework/helpers/BaseHtml.php index bb91ab51fa..729c8b934a 100644 --- a/framework/helpers/BaseHtml.php +++ b/framework/helpers/BaseHtml.php @@ -300,7 +300,8 @@ class BaseHtml * the attributes of the resulting tag. The values will be HTML-encoded using [[encode()]]. * If a value is null, the corresponding attribute will not be rendered. * See [[renderTagAttributes()]] for details on how attributes are being rendered. - * The "csrf" special option can be set to FALSE to prevent the form from generating the CSRF hidden field. + * Special options: + * - `csrf`: whether to generate the CSRF hidden input. When is not defined, defaults to true. * @return string the generated form start tag. * @see endForm() */