From 885b8c481bed58a41b5f458decafa8bbfe1635c1 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 22 Aug 2012 12:31:54 -0400 Subject: Check if files_sharing app is enabled, move file specific javascript to files_sharing app --- lib/files.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/files.php') diff --git a/lib/files.php b/lib/files.php index ce7cf2c4466..1a1fffa0a50 100644 --- a/lib/files.php +++ b/lib/files.php @@ -38,7 +38,7 @@ class OC_Files { $directory=''; } $files = array(); - if (substr($directory, 0, 7) == '/Shared') { + if (($directory == '/Shared' || substr($directory, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) { if ($directory == '/Shared') { $files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP, array('folder' => $directory, 'mimetype_filter' => $mimetype_filter)); } else { @@ -65,7 +65,7 @@ class OC_Files { } $file['permissions'] = $permissions; } - if ($directory == '') { + if ($directory == '' && OC_App::isEnabled('files_sharing')) { // Add 'Shared' folder $files = array_merge($files, OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT)); } -- cgit v1.2.3