aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/contacts/js/settings.js1
-rw-r--r--lib/public/share.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js
index 284f972be8e..ee8d889d722 100644
--- a/apps/contacts/js/settings.js
+++ b/apps/contacts/js/settings.js
@@ -4,6 +4,7 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
this.Addressbook.adrsettings = $('.addressbooks-settings').first();
this.Addressbook.adractions = $('#contacts-settings').find('div.actions');
console.log('actions: ' + this.Addressbook.adractions.length);
+ OC.Share.loadIcons('addressbook');
},
Addressbook:{
showActions:function(act) {
diff --git a/lib/public/share.php b/lib/public/share.php
index c31f316efef..f71b5089786 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -506,7 +506,7 @@ class Share {
if ($itemType == 'file' || $itemType == 'folder') {
$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, *PREFIX*fscache.path as file_source';
} else {
- $select = 'id, item_source, parent, share_type';
+ $select = 'id, item_type, item_source, parent, share_type';
}
} else {
if (isset($uidOwner)) {