summaryrefslogtreecommitdiffstats
path: root/lib/public/share.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2013-01-29 14:05:54 -0800
committerLukas Reschke <lukas@statuscode.ch>2013-01-29 14:05:54 -0800
commit250c565d2be9ebd7033c43c3362a44c58964c79b (patch)
treef8354bf6b5d6a8a37b46d4685f09342d41dd2695 /lib/public/share.php
parent472491955ae7e8172b113bd564ec242cc8bc4577 (diff)
parent665979819766bd23cddc18a3e1666f303ac25932 (diff)
downloadnextcloud-server-250c565d2be9ebd7033c43c3362a44c58964c79b.tar.gz
nextcloud-server-250c565d2be9ebd7033c43c3362a44c58964c79b.zip
Merge pull request #1360 from owncloud/display_name
introduction of display names
Diffstat (limited to 'lib/public/share.php')
-rw-r--r--lib/public/share.php9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/public/share.php b/lib/public/share.php
index cda583aa073..e1d77e652d5 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -946,6 +946,15 @@ class Share {
continue;
}
}
+
+ // Add display names to result
+ if ( isset($row['share_with']) && $row['share_with'] != '') {
+ $row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']);
+ }
+ if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
+ $row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']);
+ }
+
$items[$row['id']] = $row;
}
if (!empty($items)) {