]> source.dussan.org Git - nextcloud-server.git/commitdiff
use OC_Filesystem for rollback
authorBjoern Schiessle <schiessle@owncloud.com>
Thu, 5 Jul 2012 12:20:40 +0000 (14:20 +0200)
committerBjoern Schiessle <schiessle@owncloud.com>
Thu, 5 Jul 2012 12:20:40 +0000 (14:20 +0200)
apps/files_versions/lib/versions.php

index 412044dba7d61359db75eea1af21c55f26123b39..5611e538ad8581c18c5abdfd02d5258a1118e87c 100644 (file)
@@ -147,6 +147,9 @@ class Storage {
        public static function rollback($filename,$revision) {\r
        \r
                if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {\r
+                       $users_view = \OCP\Files::getStorage("files_versions");\r
+                       $users_view->chroot(\OCP\User::getUser().'/');\r
+                       \r
                        if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {\r
                                $pos = strpos($source, '/files', 1);\r
                                $uid = substr($source, 1, $pos - 1);\r
@@ -159,7 +162,7 @@ class Storage {
                        $filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';\r
                        \r
                        // rollback\r
-                       if ( @copy($versionsFolderName.'/'.$filename.'.v'.$revision,$filesfoldername.'/'.$filename) ) {\r
+                       if( @$users_view->copy('versions'.$filename.'.v'.$revision, 'files'.$filename) ) {\r
                        \r
                                return true;\r
                                \r