modules/image/image.field.inc | 3 +- modules/image/image.module | 52 +++++++++++++++++++++++++++++++++++++++++ modules/image/image.test | 22 ++++++++++++++++- 3 files changed, 74 insertions(+), 3 deletions(-) diff --git a/modules/image/image.field.inc b/modules/image/image.field.inc index 07cc1e0..63c5993 100644 --- a/modules/image/image.field.inc +++ b/modules/image/image.field.inc @@ -56,11 +56,10 @@ function image_field_settings_form($field, $instance) { '#type' => 'managed_file', '#description' => t('If no image is uploaded, this image will be shown on display.'), '#default_value' => $field['settings']['default_image'], - '#upload_location' => 'public://default_images/', + '#upload_location' => $settings['uri_scheme'] . '://default_images/', ); return $form; - } /** diff --git a/modules/image/image.module b/modules/image/image.module index 5caf282..6938ae0 100644 --- a/modules/image/image.module +++ b/modules/image/image.module @@ -413,6 +413,58 @@ function image_image_style_delete($style) { } /** + * Implements hook_field_delete_field(). + */ +function image_field_delete_field($field) { + if ($field['type'] != 'image') { + return; + } + + // The value of a managed_file element can be an array if #extended == TRUE. + $fid = (is_array($field['settings']['default_image']) ? $field['settings']['default_image']['fid'] : $field['settings']['default_image']); + if ($fid && ($file = file_load($fid))) { + file_usage_delete($file, 'image', 'default_image', $field['id']); + } +} + +/** + * Implements hook_field_update_field(). + */ +function image_field_update_field($field, $prior_field, $has_data) { + if ($field['type'] != 'image') { + return; + } + + // The value of a managed_file element can be an array if #extended == TRUE. + $fid_new = (is_array($field['settings']['default_image']) ? $field['settings']['default_image']['fid'] : $field['settings']['default_image']); + $fid_old = (is_array($prior_field['settings']['default_image']) ? $prior_field['settings']['default_image']['fid'] : $prior_field['settings']['default_image']); + + $file_new = $fid_new ? file_load($fid_new) : FALSE; + + if ($fid_new != $fid_old) { + + // Is there a new file? + if ($file_new) { + $file_new->status = FILE_STATUS_PERMANENT; + file_save($file_new); + file_usage_add($file_new, 'image', 'default_image', $field['id']); + } + + // Is there is an old file? + if ($fid_old && ($file_old = file_load($fid_old))) { + file_usage_delete($file_old, 'image', 'default_image', $field['id']); + } + } + + // If the upload destination changed, then move the file. + if ($file_new && (file_uri_scheme($file_new->uri) != $field['settings']['uri_scheme'])) { + $directory = $field['settings']['uri_scheme'] . '://default_images/'; + file_prepare_directory($directory, FILE_CREATE_DIRECTORY); + file_move($file_new, $directory . $file_new->filename); + } +} + +/** * Clear cached versions of a specific file in all styles. * * @param $path diff --git a/modules/image/image.test b/modules/image/image.test index eaa6ee0..b4c4647 100644 --- a/modules/image/image.test +++ b/modules/image/image.test @@ -796,7 +796,7 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase { // that would be used on the image field. $this->assertNoPattern('