Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed a crash caused by Local::copyFromStorage() not conforming to Co… #5072

Merged
merged 1 commit into from Jun 13, 2017
Merged

Fixed a crash caused by Local::copyFromStorage() not conforming to Co… #5072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Fixed a crash caused by Local::copyFromStorage() not conforming to Co… 
…mmon::copyFromStorage. Issue# 5071
  • Loading branch information
@mjmunger
mjmunger committed May 23, 2017
commit b8f2418248312826f1ccb9d7cf942f8844e02f7b
2 changes: 1 addition & 1 deletion lib/private/Files/Storage/Local.php
View file
Open in desktop
Expand Up @@ -409,7 +409,7 @@ public function getETag($path) {
* @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
Expand Down