diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
| commit | 5445b94416f50bb040e7426cadfa458607893f07 (patch) | |
| tree | 337b12362333030e0ebda37acb7f25073723a7af /apps/files_versions/lib | |
| parent | 7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff) | |
| parent | 1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff) | |
| download | nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files_versions/lib')
| -rw-r--r-- | apps/files_versions/lib/versions.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index eb0343bf608..003d548d2b2 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -79,6 +79,7 @@ class Storage { // create all parent folders $info=pathinfo($filename); + $versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$users_view->getAbsolutePath('files_versions/'); if(!file_exists($versionsFolderName.'/'.$info['dirname'])) { mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true); } @@ -128,6 +129,7 @@ class Storage { list($uidn, $newpath) = self::getUidAndFilename($newpath); $versions_view = new \OC_FilesystemView('/'.$uid .'/files_versions'); $files_view = new \OC_FilesystemView('/'.$uid .'/files'); + $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_view->getAbsolutePath('').$newpath; if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) { $versions_view->rename($oldpath, $newpath); @@ -148,8 +150,9 @@ class Storage { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { list($uid, $filename) = self::getUidAndFilename($filename); - $users_view = new \OC\Files\View('/' . \OCP\User::getUser()); - + $users_view = new \OC\Files\View('/'.$uid); + $versionCreated = false; + //first create a new version $version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename); if ( !$users_view->file_exists($version)) { |