Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / image / src / Plugin / Field / FieldType / ImageItem.php

diff --git a/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index 9e58ccd70dbcb46d0b07899661d4629efa3aa0ee..67a15a7d008423503dc03f081baf2ce7459642eb 100644 (file)
--- a/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/web/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -344,8 +344,8 @@ class ImageItem extends FileItem {
     if (!isset($images[$extension][$min_resolution][$max_resolution]) || count($images[$extension][$min_resolution][$max_resolution]) <= 5) {
       $tmp_file = drupal_tempnam('temporary://', 'generateImage_');
       $destination = $tmp_file . '.' . $extension;
-      file_unmanaged_move($tmp_file, $destination, FILE_CREATE_DIRECTORY);
-      if ($path = $random->image(drupal_realpath($destination), $min_resolution, $max_resolution)) {
+      file_unmanaged_move($tmp_file, $destination);
+      if ($path = $random->image(\Drupal::service('file_system')->realpath($destination), $min_resolution, $max_resolution)) {
         $image = File::create();
         $image->setFileUri($path);
         $image->setOwnerId(\Drupal::currentUser()->id());
@@ -354,7 +354,7 @@ class ImageItem extends FileItem {
         $destination_dir = static::doGetUploadLocation($settings);
         file_prepare_directory($destination_dir, FILE_CREATE_DIRECTORY);
         $destination = $destination_dir . '/' . basename($path);
-        $file = file_move($image, $destination, FILE_CREATE_DIRECTORY);
+        $file = file_move($image, $destination);
         $images[$extension][$min_resolution][$max_resolution][$file->id()] = $file;
       }
       else {