Commit 1b2ce46d authored by Gábor Hojtsy's avatar Gábor Hojtsy
Browse files

#201540 follow up by zoo33: move jpeg quality validation to where it belongs,...

#201540 follow up by zoo33: move jpeg quality validation to where it belongs, so it is only called if the current image toolkit requires it
parent 63a15b38
......@@ -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 {
......@@ -46,6 +47,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).
*
......
......@@ -1425,22 +1425,10 @@ 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.
*
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment