Commit f61b0494 authored by alexpott's avatar alexpott

Issue #2226241 by voidberg, claudiu.cristea: Saving image field or instance...

Issue #2226241 by voidberg, claudiu.cristea: Saving image field or instance with an inexistent default_image crashes.
parent 7f00c591
......@@ -376,9 +376,11 @@ function image_entity_presave(EntityInterface $entity) {
$entity_type_id = $entity->getEntityTypeId();
if ($entity_type_id == 'field_instance_config') {
$field = $entity->getField();
$default_settings = \Drupal::service('plugin.manager.field.field_type')->getDefaultInstanceSettings('image');
}
elseif ($entity_type_id == 'field_config') {
$field = $entity;
$default_settings = \Drupal::service('plugin.manager.field.field_type')->getDefaultSettings('image');
}
// Exit, if not saving an image field or image field instance entity.
if (!$field || $field->type != 'image') {
......@@ -389,20 +391,19 @@ function image_entity_presave(EntityInterface $entity) {
if ($fid) {
$original_fid = isset($entity->original) ? $entity->original->settings['default_image']['fid'] : NULL;
if ($fid != $original_fid) {
$image = \Drupal::service('image.factory')->get(file_load($fid)->getFileUri());
$entity->settings['default_image']['width'] = $image->getWidth();
$entity->settings['default_image']['height'] = $image->getHeight();
$file = file_load($fid);
if ($file) {
$image = \Drupal::service('image.factory')->get($file->getFileUri());
$entity->settings['default_image']['width'] = $image->getWidth();
$entity->settings['default_image']['height'] = $image->getHeight();
}
else {
$entity->settings['default_image']['fid'] = NULL;
}
}
}
else {
$entity->settings['default_image'] = array(
'fid' => NULL,
'alt' => '',
'title' => '',
'width' => NULL,
'height' => NULL,
);
}
$entity->settings['default_image'] += $default_settings['default_image'];
}
/**
......
......@@ -71,6 +71,7 @@ public static function defaultInstanceSettings() {
'default_image' => array(
'fid' => NULL,
'alt' => '',
'title' => '',
'width' => NULL,
'height' => NULL,
),
......
......@@ -291,4 +291,43 @@ public function testDefaultImages() {
);
}
/**
* Tests image field and instance having an invalid default image.
*/
public function testInvalidDefaultImage() {
$field = array(
'name' => drupal_strtolower($this->randomName()),
'entity_type' => 'node',
'type' => 'image',
'settings' => array(
'default_image' => array(
'fid' => 100000,
)
),
);
$instance = array(
'field_name' => $field['name'],
'label' => $this->randomName(),
'entity_type' => 'node',
'bundle' => 'page',
'settings' => array(
'default_image' => array(
'fid' => 100000,
)
),
);
$field_config = entity_create('field_config', $field);
$field_config->save();
$settings = $field_config->getSettings();
// The non-existent default image should not be saved.
$this->assertNull($settings['default_image']['fid']);
$field_instance_config = entity_create('field_instance_config', $instance);
$field_instance_config->save();
$settings = $field_instance_config->getSettings();
// The non-existent default image should not be saved.
$this->assertNull($settings['default_image']['fid']);
}
}
......@@ -49,7 +49,6 @@ protected function testUserAdd() {
'indexes' => array('target_id' => array('target_id')),
'settings' => array(
'uri_scheme' => 'public',
'default_image' => FALSE,
),
);
entity_create('field_config', $field)->save();
......@@ -69,7 +68,6 @@ protected function testUserAdd() {
'title_field' => 0,
'max_resolution' => '85x85',
'min_resolution' => '',
'default_image' => 0,
),
);
entity_create('field_instance_config', $instance)->save();
......
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