Error202
/
yii2-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #1283 from zeeke/master 

Checkboxlist documentation fix
tags/2.0.0-beta
Carsten Brandt 11 years ago
parent
576d4e8dda 4941db1eee
commit
28131d099c
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      framework/yii/helpers/BaseHtml.php
  2. 2
      framework/yii/widgets/ActiveField.php

4
framework/yii/helpers/BaseHtml.php
Unescape View File

@ -727,7 +727,7 @@ class BaseHtml
* @param string $name the name attribute of each checkbox. * @param string $name the name attribute of each checkbox.
* @param string|array $selection the selected value(s). * @param string|array $selection the selected value(s).
* @param array $items the data item used to generate the checkboxes. * @param array $items the data item used to generate the checkboxes.
* The array keys are the labels, while the array values are the corresponding checkbox values. * The array values are the labels, while the array keys are the corresponding checkbox values.
* @param array $options options (name => config) for the checkbox list container tag. * @param array $options options (name => config) for the checkbox list container tag.
* The following options are specially handled: * The following options are specially handled:
* *
@ -1253,7 +1253,7 @@ class BaseHtml
* @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format * @param string $attribute the attribute name or expression. See [[getAttributeName()]] for the format
* about attribute expression. * about attribute expression.
* @param array $items the data item used to generate the checkboxes. * @param array $items the data item used to generate the checkboxes.
* The array keys are the labels, while the array values are the corresponding checkbox values. * The array values are the labels, while the array keys are the corresponding checkbox values.
* Note that the labels will NOT be HTML-encoded, while the values will. * Note that the labels will NOT be HTML-encoded, while the values will.
* @param array $options options (name => config) for the checkbox list. The following options are specially handled: * @param array $options options (name => config) for the checkbox list. The following options are specially handled:
* *

2
framework/yii/widgets/ActiveField.php
Unescape View File

@ -503,7 +503,7 @@ class ActiveField extends Component
* As a result, the corresponding submitted value is an array. * As a result, the corresponding submitted value is an array.
* The selection of the checkbox list is taken from the value of the model attribute. * The selection of the checkbox list is taken from the value of the model attribute.
* @param array $items the data item used to generate the checkboxes. * @param array $items the data item used to generate the checkboxes.
* The array keys are the labels, while the array values are the corresponding checkbox values. * The array values are the labels, while the array keys are the corresponding checkbox values.
* Note that the labels will NOT be HTML-encoded, while the values will. * Note that the labels will NOT be HTML-encoded, while the values will.
* @param array $options options (name => config) for the checkbox list. The following options are specially handled: * @param array $options options (name => config) for the checkbox list. The following options are specially handled:
* *

Write Preview
Loading…
Cancel
Save