diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-06-13 17:51:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 17:51:16 -0500 |
| commit | 0b92700b52a95162bde1ac685bc2d6ef4b217cd3 (patch) | |
| tree | a6cb1bdc8bfefae70fd77099b3e956847ab32f20 /lib/private | |
| parent | 262e6fc1b0c7495a4991017eddfa924cef33ecc8 (diff) | |
| parent | b8f2418248312826f1ccb9d7cf942f8844e02f7b (diff) | |
| download | nextcloud-server-0b92700b52a95162bde1ac685bc2d6ef4b217cd3.tar.gz nextcloud-server-0b92700b52a95162bde1ac685bc2d6ef4b217cd3.zip | |
Merge pull request #5072 from mjmunger/master
Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/Files/Storage/Local.php | 2 |
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 |