From 035d83fe91aec5580c5b62b703a324b506e5c9b7 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 8 Oct 2012 23:37:50 +0200 Subject: [PATCH] don't use the workaround for shared files on the /Shared folder --- lib/files.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/files.php b/lib/files.php index 47583cf6db..2b2b8b42dc 100644 --- a/lib/files.php +++ b/lib/files.php @@ -43,12 +43,16 @@ class OC_Files { */ public static function getFileInfo($path) { if (($path == '/Shared' || substr($path, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) { - $info['size'] = OC_Filesystem::filesize($path); - $info['mtime'] = OC_Filesystem::filemtime($path); - $info['ctime'] = OC_Filesystem::filectime($path); - $info['mimetype'] = OC_Filesystem::getMimeType($path); - $info['encrypted'] = false; - $info['versioned'] = false; + if ($path == '/Shared') { + list($info) = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT); + }else{ + $info['size'] = OC_Filesystem::filesize($path); + $info['mtime'] = OC_Filesystem::filemtime($path); + $info['ctime'] = OC_Filesystem::filectime($path); + $info['mimetype'] = OC_Filesystem::getMimeType($path); + $info['encrypted'] = false; + $info['versioned'] = false; + } } else { $info = OC_FileCache::get($path); }