From a3ae36505747def7251998b177433ab55e3115f3 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 13 Jan 2006 07:44:59 +0000
Subject: [PATCH] - Patch by Zen/drumm: fixed glitch in form_select.
---
includes/form.inc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/includes/form.inc b/includes/form.inc
index d0db80c9ff75..16a465266e10 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -470,11 +470,15 @@ function form_options_flatten($array, $reset = TRUE) {
function theme_select($element) {
$select = '';
$size = $element['#size'] ? ' size="' . $element['#size'] . '"' : '';
+ // array_key_exists accomodates the rare event where $element['#value'] is NULL.
+ // isset() fails in this situation.
+ $value_valid = isset($element['#value']) || array_key_exists('#value', $element);
+ $value_is_array = is_array($element['#value']);
foreach ($element['#options'] as $key => $choice) {
if (is_array($choice)) {
$select .= '<optgroup label="'. $key .'">';
foreach ($choice as $key => $choice) {
- if (isset($element['#value']) && ($element['#value'] == $key || (is_array($element['#value']) && in_array($key, $element['#value'])))) {
+ if ($value_valid && ($element['#value'] == $key || ($value_is_array && in_array($key, $element['#value'])))) {
$selected = ' selected="selected"';
}
else {
@@ -485,7 +489,7 @@ function theme_select($element) {
$select .= '</optgroup>';
}
else {
- if (isset($element['#value']) && ($element['#value'] == $key || (is_array($element['#value']) && in_array($key, $element['#value'])))) {
+ if ($value_valid && ($element['#value'] == $key || ($value_is_array && in_array($key, $element['#value'])))) {
$selected = ' selected="selected"';
}
else {
--
GitLab