summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-11-30 04:02:18 -0800
committerBart Visscher <bartv@thisnet.nl>2012-11-30 04:02:18 -0800
commitf820596825883828d4f45a10a9f3a9317af3de1d (patch)
treebdffa19329907521c17a599f5fd08d4660b8bf40 /core
parent4db53f9d8ea3396387b1c7e5bc41c9c15922b938 (diff)
parent5c9faf396a1afc1a35f2c922e2afb98e219f3abd (diff)
downloadnextcloud-server-f820596825883828d4f45a10a9f3a9317af3de1d.tar.gz
nextcloud-server-f820596825883828d4f45a10a9f3a9317af3de1d.zip
Merge pull request #605 from owncloud/fix_false_positive_share_2
Sharing: Fix false positived v. 2
Diffstat (limited to 'core')
-rw-r--r--core/js/share.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/js/share.js b/core/js/share.js
index 0f71ae22419..475abb58bff 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -146,7 +146,7 @@ OC.Share={
showDropDown:function(itemType, itemSource, appendTo, link, possiblePermissions) {
var data = OC.Share.loadItem(itemType, itemSource);
var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
- if (data.reshare) {
+ if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
html += '<span class="reshare">'+t('core', 'Shared with you and the group {group} by {owner}', {group: data.reshare.share_with, owner: data.reshare.uid_owner})+'</span>';
} else {