diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-16 19:04:50 +0100 |
| commit | 5445b94416f50bb040e7426cadfa458607893f07 (patch) | |
| tree | 337b12362333030e0ebda37acb7f25073723a7af /apps/files_sharing | |
| parent | 7debfac0dc8f602168d8db480cfd4757b4d612b0 (diff) | |
| parent | 1d57a2e2a9d5e392bb1061479543cd1dec860c4b (diff) | |
| download | nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.tar.gz nextcloud-server-5445b94416f50bb040e7426cadfa458607893f07.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/js/share.js | 2 | ||||
| -rw-r--r-- | apps/files_sharing/public.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 8a546d62163..a46d0179801 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -1,7 +1,7 @@ $(document).ready(function() { if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined' && !publicListView) { - + FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) { if ($('#dir').val() == '/') { var item = $('#dir').val() + filename; diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 10442553e31..f85fe92ff60 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -71,7 +71,7 @@ if (isset($_GET['t'])) { $fileSource = $linkItem['file_source']; $shareOwner = $linkItem['uid_owner']; - if (OCP\User::userExists($shareOwner) && $fileSource != -1) { + if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) { $pathAndUser = getPathAndUser($linkItem['file_source']); $fileOwner = $pathAndUser['user']; @@ -167,7 +167,7 @@ if ($linkItem) { $tmpl->printPage(); exit(); } - + } else { // Check if item id is set in session if (!isset($_SESSION['public_link_authenticated']) |