mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #15333 from owncloud/copy-cross-device 

fix copying folder across devices
This commit is contained in:
Morris Jobke 2015-04-08 12:35:15 +02:00
parent dfc0a26e57 068c624b0d
commit 59322a5037
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/files/storage/local.php
View File

@ -228,6 +228,19 @@ if (\OC_Util::runningOnWindows()) {
$this->unlink($path2);
}
if ($this->is_dir($path1)) {
// we cant move folders across devices, use copy instead
$stat1 = stat(dirname($this->getSourcePath($path1)));
$stat2 = stat(dirname($this->getSourcePath($path2)));
if ($stat1['dev'] !== $stat2['dev']) {
$result = $this->copy($path1, $path2);
if ($result) {
$result &= $this->rmdir($path1);
}
return $result;
}
}
return rename($this->getSourcePath($path1), $this->getSourcePath($path2));
}