summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorNeil Drumm <drumm@3064.no-reply.drupal.org>2006-10-31 07:37:25 +0000
committerNeil Drumm <drumm@3064.no-reply.drupal.org>2006-10-31 07:37:25 +0000
commitbda84648e213999cd3fd9f585aa99447ab082f8e (patch)
treef4b0ef93ab0ea67d51476b5c5acd030cf76ade93 /includes
parentdef059a26925ce1924d59d353aaeca39176b0dea (diff)
downloadbrdo-bda84648e213999cd3fd9f585aa99447ab082f8e.tar.gz
brdo-bda84648e213999cd3fd9f585aa99447ab082f8e.tar.bz2
#24023 by vhmauery. Properly handle object option flattening.
Diffstat (limited to 'includes')
-rw-r--r--includes/form.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/includes/form.inc b/includes/form.inc
index 76ab0000f..431e3f2e7 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -843,7 +843,10 @@ function form_options_flatten($array, $reset = TRUE) {
}
foreach ($array as $key => $value) {
- if (is_array($value)) {
+ if (is_object($value)) {
+ form_options_flatten($value->option, FALSE);
+ }
+ else if (is_array($value)) {
form_options_flatten($value, FALSE);
}
else {