Commit 528a78d0 authored by catch's avatar catch
Browse files

Issue #1015916 by BTMash, jenlampton, theborg, Aron Novak, christefano,...

Issue #1015916 by BTMash, jenlampton, theborg, Aron Novak, christefano, realityloop, xjm, Kevin Hankens: Fixed Image field 'title' allows more data than database column size.
parent e202e3df
......@@ -403,7 +403,8 @@ function image_field_widget_process($element, &$form_state, $form) {
'#type' => 'textfield',
'#default_value' => isset($item['alt']) ? $item['alt'] : '',
'#description' => t('This text will be used by screen readers, search engines, or when the image cannot be loaded.'),
'#maxlength' => variable_get('image_alt_length', 80), // See http://www.gawds.org/show.php?contentid=28.
// @see http://www.gawds.org/show.php?contentid=28
'#maxlength' => 128,
'#weight' => -2,
'#access' => (bool) $item['fid'] && $settings['alt_field'],
);
......@@ -412,7 +413,7 @@ function image_field_widget_process($element, &$form_state, $form) {
'#title' => t('Title'),
'#default_value' => isset($item['title']) ? $item['title'] : '',
'#description' => t('The title is used as a tool tip when the user hovers the mouse over the image.'),
'#maxlength' => variable_get('image_title_length', 500),
'#maxlength' => 128,
'#weight' => -1,
'#access' => (bool) $item['fid'] && $settings['title_field'],
);
......
......@@ -786,6 +786,23 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
$this->drupalPost('node/' . $nid . '/edit', $edit, t('Save'));
$default_output = theme('image', $image_info);
$this->assertRaw($default_output, t('Image displayed using user supplied alt and title attributes.'));
// Verify that alt/title longer than allowed results in a validation error.
$test_size = 2000;
$max_size = 128;
$edit = array(
$field_name . '[' . LANGUAGE_NONE . '][0][alt]' => $this->randomName($test_size),
$field_name . '[' . LANGUAGE_NONE . '][0][title]' => $this->randomName($test_size),
);
$this->drupalPost('node/' . $nid . '/edit', $edit, t('Save'));
$this->assertRaw(t('Alternate text cannot be longer than %max characters but is currently %length characters long.', array(
'%max' => $max_size,
'%length' => $test_size,
)));
$this->assertRaw(t('Title cannot be longer than %max characters but is currently %length characters long.', array(
'%max' => $max_size,
'%length' => $test_size,
)));
}
/**
......
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