Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1015916 by BTMash, jenlampton, theborg, Aron Novak, christefano, realityloop, xjm, Kevin Hankens: Fixed Image field 'title' allows more data than database column size.

8.0.x
Nathaniel 2011-12-13 12:21:08 +09:00
parent e202e3df46
commit 528a78d03c
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/modules/image/image.field.inc
View File

@ -403,7 +403,8 @@ function image_field_widget_process($element, &$form_state, $form) {
'#type' => 'textfield', '#type' => 'textfield',
'#default_value' => isset($item['alt']) ? $item['alt'] : '', '#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.'), '#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, '#weight' => -2,
'#access' => (bool) $item['fid'] && $settings['alt_field'], '#access' => (bool) $item['fid'] && $settings['alt_field'],
); );
@ -412,7 +413,7 @@ function image_field_widget_process($element, &$form_state, $form) {
'#title' => t('Title'), '#title' => t('Title'),
'#default_value' => isset($item['title']) ? $item['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.'), '#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, '#weight' => -1,
'#access' => (bool) $item['fid'] && $settings['title_field'], '#access' => (bool) $item['fid'] && $settings['title_field'],
); );

17
core/modules/image/image.test
View File

@ -786,6 +786,23 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
$this->drupalPost('node/' . $nid . '/edit', $edit, t('Save')); $this->drupalPost('node/' . $nid . '/edit', $edit, t('Save'));
$default_output = theme('image', $image_info); $default_output = theme('image', $image_info);
$this->assertRaw($default_output, t('Image displayed using user supplied alt and title attributes.')); $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,
)));
} }
/** /**