X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fmigrate_drupal_ui%2Fsrc%2FBatch%2FMigrateUpgradeImportBatch.php;h=12dc5c1c89229f8c45612420f3b204c3db8a457e;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hp=8d9fd8f0a10411049948e31b5dbc4a22cefc3ff1;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

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 8d9fd8f0a..12dc5c1c8 100644
--- 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.
+      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'], '/') . '/';
     }