From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 8 May 2013 13:05:03 +0000 (+0200)
Subject: touch file relative to users file folder, otherwise the hooks will be ignored
X-Git-Tag: v6.0.0alpha2~793
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b9134dcd6a997f252db8498dec7b422e148a5681;p=nextcloud-server.git

touch file relative to users file folder, otherwise the hooks will be ignored
---

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index c38ba688fe0..836e3914dc0 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -184,11 +184,12 @@ class Storage {
 	/**
 	 * rollback to an old version of a file.
 	 */
-	public static function rollback($filename, $revision) {
+	public static function rollback($file, $revision) {
 
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
-			list($uid, $filename) = self::getUidAndFilename($filename);
+			list($uid, $filename) = self::getUidAndFilename($file);
 			$users_view = new \OC\Files\View('/'.$uid);
+			$files_view = new \OC\Files\View('/'.\OCP\User::getUser().'/files');
 			$versionCreated = false;
 
 			//first create a new version
@@ -200,8 +201,8 @@ class Storage {
 
 			// rollback
 			if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
-				$users_view->touch('files'.$filename, $revision);
-				Storage::expire($filename);
+				$files_view->touch($file, $revision);
+				Storage::expire($file);
 				return true;
 
 			}else if ( $versionCreated ) {