Skip to content

Commit

Permalink
Merge branch 'feature/source-path-keys--v3' of https://github.com/cra…
Browse files Browse the repository at this point in the history
…ftcms/cms into feature/source-path-keys--v4

# Conflicts:
#	src/elements/Asset.php
  • Loading branch information
brandonkelly committed May 23, 2023
2 parents f942d4f + 906e5fb commit 0355d7f
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/elements/Asset.php
Original file line number Diff line number Diff line change
Expand Up @@ -431,11 +431,6 @@ public static function sourcePath(string $sourceKey, string $stepKey, ?string $c
$folder = $parent;
}

// Make sure the root folder lives in the same volume as $sourceKey
if ($sourceKey !== sprintf('volume:%s', $folder->getVolume()->uid)) {
return null;
}

return $path;
}

Expand Down

0 comments on commit 0355d7f

Please sign in to comment.