summaryrefslogtreecommitdiff
path: root/modules/system
diff options
context:
space:
mode:
Diffstat (limited to 'modules/system')
-rw-r--r--modules/system/system.admin.inc4
-rw-r--r--modules/system/system.module8
2 files changed, 7 insertions, 5 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index ff70cc279..7b860c124 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -2941,7 +2941,7 @@ function system_actions_manage() {
actions_synchronize();
$actions = actions_list();
$actions_map = actions_actions_map($actions);
- $options = array(t('Choose an advanced action'));
+ $options = array();
$unconfigurable = array();
foreach ($actions_map as $key => $array) {
@@ -3013,9 +3013,7 @@ function system_actions_manage_form($form, &$form_state, $options = array()) {
);
$form['parent']['action'] = array(
'#type' => 'select',
- '#default_value' => '',
'#options' => $options,
- '#description' => '',
);
$form['parent']['actions'] = array('#type' => 'actions');
$form['parent']['actions']['submit'] = array(
diff --git a/modules/system/system.module b/modules/system/system.module
index 865eec1f1..3e6954f06 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -399,9 +399,13 @@ function system_element_info() {
);
$types['select'] = array(
'#input' => TRUE,
- '#size' => 0,
+ // In order to be able to determine whether a select list needs an empty
+ // default option, #required has to be NULL by default, as form_builder()
+ // preemptively sets #required to FALSE for all elements.
+ // @see form_process_select()
+ '#required' => NULL,
'#multiple' => FALSE,
- '#process' => array('ajax_process_form'),
+ '#process' => array('form_process_select', 'ajax_process_form'),
'#theme' => 'select',
'#theme_wrappers' => array('form_element'),
);