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

Merge pull request #5072 from mjmunger/master 

Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
This commit is contained in:
Morris Jobke 2017-06-13 17:51:16 -05:00 committed by GitHub
parent 262e6fc1b0 b8f2418248
commit 0b92700b52
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Files/Storage/Local.php
View File

@ -409,7 +409,7 @@ class Local extends \OC\Files\Storage\Common {
* @param string $targetInternalPath * @param string $targetInternalPath
* @return bool * @return bool
*/ */
public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath) { public function copyFromStorage(\OCP\Files\Storage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')) { if ($sourceStorage->instanceOfStorage('\OC\Files\Storage\Local')) {
/** /**
* @var \OC\Files\Storage\Local $sourceStorage * @var \OC\Files\Storage\Local $sourceStorage