diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-03 21:53:02 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-02-03 21:53:02 -0800 |
| commit | 5ceddabaa65396d42fe67b4b6de5cd72bcb28f11 (patch) | |
| tree | 3942f2692aabef60824f5112584865643d89d672 | |
| parent | 95fd2d8d1eaeb02a48039c8d0c3195487bff8957 (diff) | |
| parent | c1072d0c09428525929a5e6154738245a23e5225 (diff) | |
| download | nextcloud-server-5ceddabaa65396d42fe67b4b6de5cd72bcb28f11.tar.gz nextcloud-server-5ceddabaa65396d42fe67b4b6de5cd72bcb28f11.zip | |
Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
Fixing js errors public link master
| -rw-r--r-- | apps/files/js/files.js | 4 | ||||
| -rw-r--r-- | apps/files/templates/part.list.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/public.php | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 3d09d6aa2b6..8aec701e53f 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -776,6 +776,10 @@ $(document).ready(function() { }); function scanFiles(force, dir){ + if (!OC.currentUser) { + return; + } + if(!dir){ dir = ''; } diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php index 5c39dda85ff..3c6c5dbd267 100644 --- a/apps/files/templates/part.list.php +++ b/apps/files/templates/part.list.php @@ -28,7 +28,7 @@ > <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?> <?php if($file['type'] == 'dir'): ?> - <a class="name" href="<?php echo $_['baseURL'].$directory.'/'.$name; ?>)" title=""> + <a class="name" href="<?php echo $_['baseURL'].$directory.'/'.$name; ?>" title=""> <?php else: ?> <a class="name" href="<?php echo $_['downloadURL'].$directory.'/'.$name; ?>" title=""> <?php endif; ?> diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 9cf45e56fb9..a3e0ec192af 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -235,6 +235,7 @@ if ($linkItem) { OCP\Util::addStyle('files', 'files'); OCP\Util::addScript('files', 'files'); OCP\Util::addScript('files', 'filelist'); + OCP\Util::addscript('files', 'keyboardshortcuts'); $files = array(); $rootLength = strlen($basePath) + 1; foreach (OC_Files::getDirectoryContent($path) as $i) { |