summaryrefslogtreecommitdiff
path: root/modules/image/image.field.inc
diff options
context:
space:
mode:
Diffstat (limited to 'modules/image/image.field.inc')
-rw-r--r--modules/image/image.field.inc9
1 files changed, 6 insertions, 3 deletions
diff --git a/modules/image/image.field.inc b/modules/image/image.field.inc
index b54e601ab..221c5959d 100644
--- a/modules/image/image.field.inc
+++ b/modules/image/image.field.inc
@@ -269,7 +269,8 @@ function image_field_widget_settings_form($field, $instance) {
$form['preview_image_style'] = array(
'#title' => t('Preview image style'),
'#type' => 'select',
- '#options' => array('' => '<' . t('no preview') . '>') + image_style_options(FALSE),
+ '#required' => FALSE,
+ '#options' => image_style_options(FALSE),
'#default_value' => $settings['preview_image_style'],
'#description' => t('The preview image will be shown while editing the content.'),
'#weight' => 15,
@@ -418,22 +419,24 @@ function image_field_formatter_settings_form($field, $instance, $view_mode, $for
$display = $instance['display'][$view_mode];
$settings = $display['settings'];
- $image_styles = array('' => t('None (original image)')) + image_style_options(FALSE);
+ $image_styles = image_style_options(FALSE);
$form['image_style'] = array(
'#title' => t('Image style'),
'#type' => 'select',
+ '#required' => FALSE,
'#default_value' => $settings['image_style'],
+ '#empty_option' => t('None (original image)'),
'#options' => $image_styles,
);
$link_types = array(
- '' => t('<none>'),
'content' => t('Content'),
'file' => t('File'),
);
$form['image_link'] = array(
'#title' => t('Link image to'),
'#type' => 'select',
+ '#required' => FALSE,
'#default_value' => $settings['image_link'],
'#options' => $link_types,
);