get timestamp from file instead from time(); typo fixed
This commit is contained in:
parent
2a42344781
commit
0e0d54dc58
|
@ -92,7 +92,7 @@ class Storage {
|
||||||
}
|
}
|
||||||
|
|
||||||
// store a new version of a file
|
// store a new version of a file
|
||||||
$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time());
|
$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
|
||||||
|
|
||||||
// expire old revisions if necessary
|
// expire old revisions if necessary
|
||||||
Storage::expire($filename);
|
Storage::expire($filename);
|
||||||
|
@ -109,13 +109,20 @@ class Storage {
|
||||||
list($uid, $filename) = self::getUidAndFilename($filename);
|
list($uid, $filename) = self::getUidAndFilename($filename);
|
||||||
$users_view = new \OC_FilesystemView('/'.$uid);
|
$users_view = new \OC_FilesystemView('/'.$uid);
|
||||||
|
|
||||||
|
//first create a new version
|
||||||
|
if ( !$users_view->file_exists('files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename))) {
|
||||||
|
$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
|
||||||
|
$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename));
|
||||||
|
}
|
||||||
|
|
||||||
// rollback
|
// rollback
|
||||||
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
|
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
|
||||||
|
Storage::expire($filename);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
|
if (isset($version) ) {
|
||||||
|
$users_view->unlink($version);
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -274,7 +281,7 @@ class Storage {
|
||||||
} else { // time to move on to the next interval
|
} else { // time to move on to the next interval
|
||||||
$interval++;
|
$interval++;
|
||||||
$step = Storage::$max_versions_per_interval[$interval]['step'];
|
$step = Storage::$max_versions_per_interval[$interval]['step'];
|
||||||
$nextVersion = $version[$i]['version'] - $step;
|
$nextVersion = $versions[$i]['version'] - $step;
|
||||||
if ( Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1 ) {
|
if ( Storage::$max_versions_per_interval[$interval]['intervalEndsAfter'] == -1 ) {
|
||||||
$nextInterval = -1;
|
$nextInterval = -1;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue