diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-30 19:24:24 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-30 19:24:24 +0100 |
| commit | 207aa22d12931d161f682198996086e74c91bf53 (patch) | |
| tree | 26f65a42462244fdfc14e15c7788da8b7f8a524e /apps/files_sharing | |
| parent | 95352fbc1568e0c49be25461a07d53b3d5ad3b45 (diff) | |
| parent | 2fbf3d40900d29c04b69f0c18e4d833a312fb21c (diff) | |
| download | nextcloud-server-207aa22d12931d161f682198996086e74c91bf53.tar.gz nextcloud-server-207aa22d12931d161f682198996086e74c91bf53.zip | |
merge master into filesystem
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/public.php | 1 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index 78eb63985f6..9cf45e56fb9 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -217,6 +217,7 @@ if ($linkItem) { OCP\Util::addScript('files', 'fileactions'); $tmpl = new OCP\Template('files_sharing', 'public', 'base'); $tmpl->assign('uidOwner', $shareOwner); + $tmpl->assign('displayName', \OCP\User::getDisplayName($shareOwner)); $tmpl->assign('dir', $dir); $tmpl->assign('filename', $file); $tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path)); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 35cca7c42dc..71fca09ed6d 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -6,9 +6,9 @@ <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> <div class="header-right"> <?php if (isset($_['folder'])): ?> - <span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['uidOwner'], $_['filename'])) ?></span> + <span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['displayName'], $_['filename'])) ?></span> <?php else: ?> - <span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['uidOwner'], $_['filename'])) ?></span> + <span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['displayName'], $_['filename'])) ?></span> <?php endif; ?> <?php if (!isset($_['folder']) || $_['allowZipDownload']): ?> <a href="<?php echo $_['downloadURL']; ?>" class="button" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a> |