summaryrefslogtreecommitdiff
path: root/modules/image/image.admin.inc
diff options
context:
space:
mode:
Diffstat (limited to 'modules/image/image.admin.inc')
-rw-r--r--modules/image/image.admin.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/modules/image/image.admin.inc b/modules/image/image.admin.inc
index 657781156..9665a8523 100644
--- a/modules/image/image.admin.inc
+++ b/modules/image/image.admin.inc
@@ -116,7 +116,7 @@ function image_style_form($form, &$form_state, $style) {
}
// Build the new image effect addition form and add it to the effect list.
- $new_effect_options = array('' => t('Select a new effect'));
+ $new_effect_options = array();
foreach (image_effect_definitions() as $effect => $definition) {
$new_effect_options[$effect] = check_plain($definition['label']);
}
@@ -127,7 +127,9 @@ function image_style_form($form, &$form_state, $style) {
);
$form['effects']['new']['new'] = array(
'#type' => 'select',
+ '#required' => FALSE,
'#options' => $new_effect_options,
+ '#empty_option' => t('Select a new effect'),
);
$form['effects']['new']['weight'] = array(
'#type' => 'weight',
@@ -291,11 +293,12 @@ function image_style_delete_form($form, $form_state, $style) {
$form_state['image_style'] = $style;
$replacement_styles = array_diff_key(image_style_options(), array($style['name'] => ''));
- $replacement_styles[''] = t('No replacement, just delete');
$form['replacement'] = array(
'#title' => t('Replacement style'),
'#type' => 'select',
+ '#required' => FALSE,
'#options' => $replacement_styles,
+ '#empty_option' => t('No replacement, just delete'),
);
return confirm_form(