diff -u b/modules/image/image.admin.inc b/modules/image/image.admin.inc --- b/modules/image/image.admin.inc +++ b/modules/image/image.admin.inc @@ -56,23 +56,23 @@ '#markup' => theme('image_style_preview', array('style' => $style)), ); + // Show the Image Style label. + $form['label'] = array( + '#type' => 'textfield', + '#title' => t('Image style name'), + '#default_value' => $style['label'], + '#required' => TRUE, + ); + // Allow the name of the style to be changed, unless this style is // provided by a module's hook_default_image_styles(). if ($style['storage'] & IMAGE_STORAGE_MODULE) { $form['name'] = array( - '#type' => 'item', - '#title' => t('Image style name'), - '#markup' => $style['label'], - '#description' => t('This image style is being provided by %module module and may not be renamed.', array('%module' => $style['module'])), + '#type' => 'value', + '#value' => $style['name'], ); } else { - $form['label'] = array( - '#type' => 'textfield', - '#title' => t('Image style name'), - '#default_value' => $style['label'], - '#required' => TRUE, - ); $form['name'] = array( '#type' => 'machine_name', '#size' => '64', @@ -214,17 +214,10 @@ * Submit handler for saving an image style. */ function image_style_form_submit($form, &$form_state) { + // Update the image style. $style = $form_state['image_style']; - - // Update the image style name if it has changed. - if (isset($form_state['values']['name']) && $style['name'] != $form_state['values']['name']) { - $style['name'] = $form_state['values']['name']; - } - - // Update the image style label if it has changed. - if (isset($form_state['values']['label']) && $style['label'] != $form_state['values']['label']) { - $style['label'] = $form_state['values']['label']; - } + $style['name'] = $form_state['values']['name']; + $style['label'] = $form_state['values']['label']; // Update image effect weights. if (!empty($form_state['values']['effects'])) {