Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
a3ae3650
Commit
a3ae3650
authored
Jan 13, 2006
by
Dries
Browse files
- Patch by Zen/drumm: fixed glitch in form_select.
parent
07c2ef32
Changes
1
Hide whitespace changes
Inline
Side-by-side
includes/form.inc
View file @
a3ae3650
...
...
@@ -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
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment