From d4d43f11eacc7f566d612a19c176a8c4ac867df6 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sat, 29 Aug 2009 16:30:14 +0000
Subject: #560944 by seutje: Fixed collapsible fieldsets in Garland.

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

diff --git a/includes/form.inc b/includes/form.inc
index 0e6221ce7..6bde787aa 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -1625,7 +1625,6 @@ function form_get_options($element, $key) {
  */
 function theme_fieldset($element) {
   if (!empty($element['#collapsible'])) {
-    $element['#attached_js']['misc/collapse.js'] = array();
 
     if (!isset($element['#attributes']['class'])) {
       $element['#attributes']['class'] = array();
@@ -2247,6 +2246,9 @@ function form_process_fieldset(&$element, &$form_state) {
 
   // Contains form element summary functionalities.
   $element['#attached_js']['misc/form.js'] = array('weight' => JS_LIBRARY + 1);
+  if (!empty($element['#collapsible'])) {
+    $element['#attached_js']['misc/collapse.js'] = array();
+  }
 
   return $element;
 }
-- 
cgit v1.2.3