don't use the workaround for shared files on the /Shared folder

This commit is contained in:
Robin Appelman 2012-10-08 23:37:50 +02:00
parent 025d308929
commit 035d83fe91
1 changed files with 10 additions and 6 deletions

View File

@ -43,12 +43,16 @@ class OC_Files {
*/ */
public static function getFileInfo($path) { public static function getFileInfo($path) {
if (($path == '/Shared' || substr($path, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) { if (($path == '/Shared' || substr($path, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) {
$info['size'] = OC_Filesystem::filesize($path); if ($path == '/Shared') {
$info['mtime'] = OC_Filesystem::filemtime($path); list($info) = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT);
$info['ctime'] = OC_Filesystem::filectime($path); }else{
$info['mimetype'] = OC_Filesystem::getMimeType($path); $info['size'] = OC_Filesystem::filesize($path);
$info['encrypted'] = false; $info['mtime'] = OC_Filesystem::filemtime($path);
$info['versioned'] = false; $info['ctime'] = OC_Filesystem::filectime($path);
$info['mimetype'] = OC_Filesystem::getMimeType($path);
$info['encrypted'] = false;
$info['versioned'] = false;
}
} else { } else {
$info = OC_FileCache::get($path); $info = OC_FileCache::get($path);
} }