diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-22 12:31:54 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-22 12:32:07 -0400 |
| commit | 885b8c481bed58a41b5f458decafa8bbfe1635c1 (patch) | |
| tree | 3ebcf7cad00b92bcaa916a2f2f31ba9e8cf806fb /lib/files.php | |
| parent | 3debb6745815bb854c477d63090b7df03620ab20 (diff) | |
| download | nextcloud-server-885b8c481bed58a41b5f458decafa8bbfe1635c1.tar.gz nextcloud-server-885b8c481bed58a41b5f458decafa8bbfe1635c1.zip | |
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
Diffstat (limited to 'lib/files.php')
| -rw-r--r-- | lib/files.php | 4 |
1 files changed, 2 insertions, 2 deletions
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)); } |