X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fcore%2Fmodules%2Ffile%2Fsrc%2FPlugin%2Fmigrate%2Fsource%2Fd7%2FFile.php;fp=web%2Fcore%2Fmodules%2Ffile%2Fsrc%2FPlugin%2Fmigrate%2Fsource%2Fd7%2FFile.php;h=c0da770b70a769ed3ee85ed21418985e54bdc536;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hp=5e88151229ade20e0f5710a10bb80b61574bfec4;hpb=74df008bdbb3a11eeea356744f39b802369bda3c;p=yaffs-website

diff --git a/web/core/modules/file/src/Plugin/migrate/source/d7/File.php b/web/core/modules/file/src/Plugin/migrate/source/d7/File.php
index 5e8815122..c0da770b7 100644
--- a/web/core/modules/file/src/Plugin/migrate/source/d7/File.php
+++ b/web/core/modules/file/src/Plugin/migrate/source/d7/File.php
@@ -43,18 +43,21 @@ class File extends DrupalSqlBase {
   public function query() {
     $query = $this->select('file_managed', 'f')
       ->fields('f')
+      ->condition('uri', 'temporary://%', 'NOT LIKE')
       ->orderBy('f.timestamp');
 
     // Filter by scheme(s), if configured.
     if (isset($this->configuration['scheme'])) {
       $schemes = [];
+      // Remove 'temporary' scheme.
+      $valid_schemes = array_diff((array) $this->configuration['scheme'], ['temporary']);
       // Accept either a single scheme, or a list.
-      foreach ((array) $this->configuration['scheme'] as $scheme) {
+      foreach ((array) $valid_schemes as $scheme) {
         $schemes[] = rtrim($scheme) . '://';
       }
       $schemes = array_map([$this->getDatabase(), 'escapeLike'], $schemes);
 
-      // uri LIKE 'public://%' OR uri LIKE 'private://%'
+      // Add conditions, uri LIKE 'public://%' OR uri LIKE 'private://%'.
       $conditions = new Condition('OR');
       foreach ($schemes as $scheme) {
         $conditions->condition('uri', $scheme . '%', 'LIKE');