diff options
| -rw-r--r-- | includes/image.gd.inc | 14 | ||||
| -rw-r--r-- | modules/system/system.admin.inc | 12 |
2 files changed, 13 insertions, 13 deletions
diff --git a/includes/image.gd.inc b/includes/image.gd.inc index 7ae60dcf1..de887e35f 100644 --- a/includes/image.gd.inc +++ b/includes/image.gd.inc @@ -37,7 +37,8 @@ function image_gd_settings() { '#default_value' => variable_get('image_jpeg_quality', 75), '#field_suffix' => t('%'), ); - + $form['#element_validate'] = array('image_gd_settings_validate'); + return $form; } else { @@ -47,6 +48,17 @@ function image_gd_settings() { } /** + * Validate the submitted GD settings. + */ +function image_gd_settings_validate($form, &$form_state) { + // Validate image quality range. + $value = $form_state['values']['image_jpeg_quality']; + if (!is_numeric($value) || $value < 0 || $value > 100) { + form_set_error('image_jpeg_quality', t('JPEG quality must be a number between 0 and 100.')); + } +} + +/** * Verify GD2 settings (that the right version is actually installed). * * @return diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 7adbcaab2..af6e53c8a 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1425,23 +1425,11 @@ function system_image_toolkit_settings() { } $form['image_toolkit_settings'] = image_toolkit_invoke('settings'); - $form['#validate'][] = 'system_image_toolkit_settings_validate'; return system_settings_form($form); } /** - * Validate the submitted image-toolkit form. - */ -function system_image_toolkit_settings_validate($form, &$form_state) { - // Validate image quality range. - $value = $form_state['values']['image_jpeg_quality']; - if (!is_numeric($value) || $value < 0 || $value > 100) { - form_set_error('image_jpeg_quality', t('JPEG quality must be a number between 0 and 100.')); - } -} - -/** * Form builder; Configure how the site handles RSS feeds. * * @ingroup forms |