Skip to content

Commit 2cade7c

Browse files
icewind1991backportbot[bot]
authored andcommitted
fix: pass correct source cache in ObjectStoreStorage::copyFile
I don't think this actually matters, but better to be correct Signed-off-by: Robin Appelman <robin@icewind.nl>
1 parent 9f1a39b commit 2cade7c

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

‎lib/private/Files/ObjectStore/ObjectStoreStorage.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -708,11 +708,11 @@ private function copyInner(ICache $sourceCache, ICacheEntry $sourceEntry, string
708708
$this->copyInner($sourceCache, $child, $to . '/' . $child->getName());
709709
}
710710
} else {
711-
$this->copyFile($sourceEntry, $to);
711+
$this->copyFile($sourceCache, $sourceEntry, $to);
712712
}
713713
}
714714

715-
private function copyFile(ICacheEntry $sourceEntry, string $to) {
715+
private function copyFile(ICache $sourceCache, ICacheEntry $sourceEntry, string $to) {
716716
$cache = $this->getCache();
717717

718718
$sourceUrn = $this->getURN($sourceEntry->getId());
@@ -721,7 +721,7 @@ private function copyFile(ICacheEntry $sourceEntry, string $to) {
721721
throw new \Exception('Invalid source cache for object store copy');
722722
}
723723

724-
$targetId = $cache->copyFromCache($cache, $sourceEntry, $to);
724+
$targetId = $cache->copyFromCache($sourceCache, $sourceEntry, $to);
725725

726726
$targetUrn = $this->getURN($targetId);
727727

0 commit comments

Comments
 (0)