Merge branch 'master' into sharing

This commit is contained in:
Michael Gapczynski 2011-07-12 20:51:07 -04:00
commit a79f2535f8
1 changed files with 1 additions and 1 deletions

View File

@ -412,7 +412,7 @@ class OC_FILESYSTEM{
}
}elseif($storage1=self::getStorage($path1) and $storage2=self::getStorage($path2)){
$tmpFile=$storage1->toTmpFile(self::getInternalPath($path1));
$result=$storage2->fromTmpFile(self::getInternalPath($path2));
$result=$storage2->fromTmpFile($tmpFile,self::getInternalPath($path2));
}
OC_HOOK::emit( 'OC_FILESYSTEM', 'post_copy', array( 'oldpath' => $path1 ,'newpath'=>$path2));
if(!$exists){