diff options
| author | David Rothstein <drothstein@gmail.com> | 2014-07-16 16:08:05 -0400 |
|---|---|---|
| committer | David Rothstein <drothstein@gmail.com> | 2014-07-16 16:08:05 -0400 |
| commit | 3310afeb856564d2bc0c03512566bff60029d7be (patch) | |
| tree | 3daebf4b2b5965c66e93180d31338439a6a76625 /includes/form.inc | |
| parent | 338e2d4db78cc346a7491b54537b4120f53a8da2 (diff) | |
| parent | 83b80acad8431fcd56e9a331ba06c41edee48c91 (diff) | |
| download | brdo-3310afeb856564d2bc0c03512566bff60029d7be.tar.gz brdo-3310afeb856564d2bc0c03512566bff60029d7be.tar.bz2 | |
Merge tag '7.29' into 7.x
7.29 release
Conflicts:
includes/bootstrap.inc
Diffstat (limited to 'includes/form.inc')
| -rw-r--r-- | includes/form.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/form.inc b/includes/form.inc index 846bcb51f..3840885c1 100644 --- a/includes/form.inc +++ b/includes/form.inc @@ -2722,7 +2722,7 @@ function form_select_options($element, $choices = NULL) { $options = ''; foreach ($choices as $key => $choice) { if (is_array($choice)) { - $options .= '<optgroup label="' . $key . '">'; + $options .= '<optgroup label="' . check_plain($key) . '">'; $options .= form_select_options($element, $choice); $options .= '</optgroup>'; } |