From bda84648e213999cd3fd9f585aa99447ab082f8e Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Tue, 31 Oct 2006 07:37:25 +0000
Subject: [PATCH] #24023 by vhmauery. Properly handle object option flattening.

---
 includes/form.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/includes/form.inc b/includes/form.inc
index 76ab0000f5b5..431e3f2e74d6 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 {
-- 
GitLab