aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-07-04 12:23:41 +0200
committerGitHub <noreply@github.com>2016-07-04 12:23:41 +0200
commit2f475a9f1e39933a7ca9dbbb047916d70068f308 (patch)
tree4eab3ff849ae1ef434a97680a10910e43d6f9755
parentb3fbf8b3f30e3fdd913deacc56072bd49d86529f (diff)
parent4a4cac611f7d7a188cb80364d9e7b5c49e5346bf (diff)
downloadnextcloud-server-2f475a9f1e39933a7ca9dbbb047916d70068f308.tar.gz
nextcloud-server-2f475a9f1e39933a7ca9dbbb047916d70068f308.zip
Merge pull request #284 from nextcloud/cleanup-after-sync
we don't need to check permissions twice
-rw-r--r--apps/files_versions/lib/Storage.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index 9a0fe0a7b37..f0cd9d65310 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -313,6 +313,7 @@ class Storage {
*
* @param string $file file name
* @param int $revision revision timestamp
+ * @return bool
*/
public static function rollback($file, $revision) {
@@ -323,13 +324,10 @@ class Storage {
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);