mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #525 from owncloud/fix_metadata_on_upload 

add root as parameter to keep default root for non-shared folder/files
This commit is contained in:
Björn Schießle 2012-11-21 03:50:59 -08:00
parent 756424b6dd ea54fe98f7
commit 89bdb78f0a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/filecache.php
View File

@ -44,7 +44,7 @@ class OC_FileCache{
*/
public static function get($path,$root=false) {
list($path, $root) = self::getSourcePathOfSharedFile($path);
list($path, $root) = self::getSourcePathOfSharedFile($path, $root);
if(OC_FileCache_Update::hasUpdated($path,$root)) {
if($root===false) {//filesystem hooks are only valid for the default root
@ -281,7 +281,7 @@ class OC_FileCache{
*/
public static function getId($path,$root=false) {
list($path, $root) = self::getSourcePathOfSharedFile($path);
list($path, $root) = self::getSourcePathOfSharedFile($path, $root);
if($root===false) {
$root=OC_Filesystem::getRoot();
@ -519,14 +519,16 @@ class OC_FileCache{
* @param string $path
* @return array with the path and the root of the give file
*/
private static function getSourcePathOfSharedFile($path) {
if ( OC_App::isEnabled('files_sharing') && !strncmp($path, '/Shared/', 8)) {
private static function getSourcePathOfSharedFile($path, $root) {
if ( OC_App::isEnabled('files_sharing')) {
$fullPath = OC_Filesystem::normalizePath($root.'/'.$path);
$sharedPos = strpos($fullPath, '/Shared/');
if ( $sharedPos !== false && ($source = OC_Files_Sharing_Util::getSourcePath(substr($fullPath, $sharedPos+8))) ) {
$source = OC_Files_Sharing_Util::getSourcePath(str_replace('/Shared/', '', $path));
$parts = explode('/', $source, 4);
$root = '/'.$parts[1].'/files';
$path = '/'.$parts[3];
} else {
$root = false;
}
}
return array($path, $root);