diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
| commit | 179a355b2cd3dc489a54cc27fd717f67373d0b1e (patch) | |
| tree | f87a5586086635d4cbd18771b442ee771f79e441 /apps/files_versions/lib | |
| parent | 8e002b61554308cb4d50570f715303a82136f0fa (diff) | |
| parent | 2d2d2267f7f38ca29e7b87f40fae62261614b0d1 (diff) | |
| download | nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.tar.gz nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.zip | |
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
Diffstat (limited to 'apps/files_versions/lib')
| -rw-r--r-- | apps/files_versions/lib/Storage.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index b14210af7b1..9a0fe0a7b37 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -320,8 +320,16 @@ class Storage { // add expected leading slash $file = '/' . ltrim($file, '/'); list($uid, $filename) = self::getUidAndFilename($file); + if ($uid === null || trim($filename, '/') === '') { + return false; + } $users_view = new View('/'.$uid); $files_view = new View('/'. User::getUser().'/files'); + + if (!$files_view->isUpdatable($filename)) { + return false; + } + $versionCreated = false; $fileInfo = $files_view->getFileInfo($file); |