sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12907 from owncloud/delete-invalid-external-share 

Fix deleting invalid s2s shares
remotes/origin/fix-10825
Robin Appelman 2014-12-18 16:38:13 +07:00
parent 10a0fc2856 e656af4c83
commit 1ef01de402
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/files_sharing/lib/external/storage.php vendored
Unescape Escape View File

@ -167,6 +167,14 @@ class Storage extends DAV implements ISharedStorage {
}
}
public function file_exists($path) {
if ($path === '') {
return true;
} else {
return parent::file_exists($path);
}
}
/**
* check if the configured remote is a valid ownCloud instance
*

5
lib/private/files/view.php
Unescape Escape View File

@ -280,6 +280,11 @@ class View {
}
public function isDeletable($path) {
$absolutePath = $this->getAbsolutePath($path);
$mount = Filesystem::getMountManager()->find($absolutePath);
if ($mount->getInternalPath($absolutePath) === '') {
return $mount instanceof MoveableMount;
}
return $this->basicOperation('isDeletable', $path);
}