aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-05-08 16:32:29 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-05-08 16:32:29 +0200
commit35da6f25b166c05d899ee493f6fdd1c35088302b (patch)
treec523183265702fc8de8e2b4e4aa29b1193bac043
parentc43ec33ecb86892b308cc3b664553f14a115d2f9 (diff)
downloadnextcloud-server-35da6f25b166c05d899ee493f6fdd1c35088302b.tar.gz
nextcloud-server-35da6f25b166c05d899ee493f6fdd1c35088302b.zip
rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file
-rw-r--r--apps/files_versions/lib/versions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 836e3914dc0..5fdbef27743 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -200,7 +200,7 @@ class Storage {
}
// rollback
- if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
+ if( @$users_view->rename('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
$files_view->touch($file, $revision);
Storage::expire($file);
return true;