summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMichael Munger <michael@highpoweredhelp.com>2017-05-23 10:29:30 -0400
committerMorris Jobke <hey@morrisjobke.de>2017-06-13 18:05:16 -0500
commit513401bdb6202f4fa1e69f1d9a0c477a607a9502 (patch)
treed263e3b67cf3f9afed3ae827287241ffd3e168ed /lib
parentd4eb5cfecbb54d4e36d0c225066fca8337cf8b0b (diff)
downloadnextcloud-server-513401bdb6202f4fa1e69f1d9a0c477a607a9502.tar.gz
nextcloud-server-513401bdb6202f4fa1e69f1d9a0c477a607a9502.zip
Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Storage/Local.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index 4eb9fb13deb..70cb2e0ccc4 100644
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -409,7 +409,7 @@ class Local extends \OC\Files\Storage\Common {
* @param string $targetInternalPath
* @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')) {
/**
* @var \OC\Files\Storage\Local $sourceStorage