From a529d535929204ad99704fb51827098e41d02095 Mon Sep 17 00:00:00 2001
From: Dan Chadwick <dan899@gmail.com>
Date: Tue, 28 Jul 2015 14:35:58 -0400
Subject: [PATCH] Issue #2536426 by DanChadwick: Position fieldset are
 displayed in "Select options" component edit page.

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

diff --git a/includes/webform.components.inc b/includes/webform.components.inc
index 444618b..1b78ad1 100644
--- a/includes/webform.components.inc
+++ b/includes/webform.components.inc
@@ -386,7 +386,6 @@ function webform_component_edit_form($form, $form_state, $node, $component, $clo
   drupal_set_title(t('Edit component: @name', array('@name' => $component['name'])), PASS_THROUGH);
 
   $form['#node'] = $node;
-  $form['#attached']['library'][] = array('webform', 'admin');
   $form['#tree'] = TRUE;
 
   // Print the correct field type specification.
@@ -590,6 +589,9 @@ function webform_component_edit_form($form, $form_state, $node, $component, $clo
     unset($form['validation']);
   }
   $form = array_merge($form, $additional_form_elements);
+  // Ensure that the webform admin library is attached, possibly in addition to
+  // component-specific attachments.
+  $form['#attached']['library'][] = array('webform', 'admin');
 
   // Add the submit button.
   $form['actions'] = array(
-- 
1.8.3.msysgit.0

