Upgraded drupal core with security updates

[yaffs-website] / web / core / modules / migrate_drupal_ui / src / Batch / MigrateUpgradeImportBatch.php

diff --git a/web/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php b/web/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
index 8d9fd8f0a10411049948e31b5dbc4a22cefc3ff1..12dc5c1c89229f8c45612420f3b204c3db8a457e 100644 (file)
--- a/web/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
+++ b/web/core/modules/migrate_drupal_ui/src/Batch/MigrateUpgradeImportBatch.php
@@ -104,6 +104,9 @@ class MigrateUpgradeImportBatch {
     // @todo Find a way to avoid this in https://www.drupal.org/node/2804611.
     if ($definition['destination']['plugin'] === 'entity:file') {
       // Make sure we have a single trailing slash.
     // @todo Find a way to avoid this in https://www.drupal.org/node/2804611.
     if ($definition['destination']['plugin'] === 'entity:file') {
       // Make sure we have a single trailing slash.

+      if ($definition['source']['plugin'] === 'd7_file_private') {
+        $configuration['source']['constants']['source_base_path'] = rtrim($config['source_private_file_path'], '/') . '/';
+      }

       $configuration['source']['constants']['source_base_path'] = rtrim($config['source_base_path'], '/') . '/';
     }
 
       $configuration['source']['constants']['source_base_path'] = rtrim($config['source_base_path'], '/') . '/';
     }