[Pkg-owncloud-commits] [owncloud] 177/394: Backport #605 fix false positives when sharing.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 2f21225155c1dd3e61b4b2ae988d344fccbd73bb
Author: Thomas Tanghus <thomas at tanghus.net>
Date:   Tue Dec 4 18:33:31 2012 +0100

    Backport #605 fix false positives when sharing.
---
 core/js/share.js |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 50a9d0a..019f35d 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -125,7 +125,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')+' '+data.reshare.share_with+' '+t('core', 'by')+' '+data.reshare.uid_owner+'</span>';
 			} else {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git