Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master

Fixing js errors public link master
This commit is contained in:
Thomas Müller 2013-02-03 21:53:02 -08:00
commit 5ceddabaa6
3 changed files with 6 additions and 1 deletions

View File

@ -776,6 +776,10 @@ $(document).ready(function() {
}); });
function scanFiles(force, dir){ function scanFiles(force, dir){
if (!OC.currentUser) {
return;
}
if(!dir){ if(!dir){
dir = ''; dir = '';
} }

View File

@ -28,7 +28,7 @@
> >
<?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?> <?php if(!isset($_['readonly']) || !$_['readonly']): ?><input type="checkbox" /><?php endif; ?>
<?php if($file['type'] == 'dir'): ?> <?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: ?> <?php else: ?>
<a class="name" href="<?php echo $_['downloadURL'].$directory.'/'.$name; ?>" title=""> <a class="name" href="<?php echo $_['downloadURL'].$directory.'/'.$name; ?>" title="">
<?php endif; ?> <?php endif; ?>

View File

@ -235,6 +235,7 @@ if ($linkItem) {
OCP\Util::addStyle('files', 'files'); OCP\Util::addStyle('files', 'files');
OCP\Util::addScript('files', 'files'); OCP\Util::addScript('files', 'files');
OCP\Util::addScript('files', 'filelist'); OCP\Util::addScript('files', 'filelist');
OCP\Util::addscript('files', 'keyboardshortcuts');
$files = array(); $files = array();
$rootLength = strlen($basePath) + 1; $rootLength = strlen($basePath) + 1;
foreach (OC_Files::getDirectoryContent($path) as $i) { foreach (OC_Files::getDirectoryContent($path) as $i) {