summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJörn Friedrich Dreyer <jfd@butonic.de>2013-07-23 08:23:15 -0700
committerJörn Friedrich Dreyer <jfd@butonic.de>2013-07-23 08:23:15 -0700
commitab77af7b4dbb4ae6625f6684bf7d39f2bb48cc81 (patch)
tree5a6c9085cfbbfab31e0e1bd35da5244127e1ccfd /core
parenta94c55be987127d148b3a6d5820bf06fc9d74068 (diff)
parentab997bdc68042fa292877e17bb991d79cbed0738 (diff)
downloadnextcloud-server-ab77af7b4dbb4ae6625f6684bf7d39f2bb48cc81.tar.gz
nextcloud-server-ab77af7b4dbb4ae6625f6684bf7d39f2bb48cc81.zip
Merge pull request #4159 from owncloud/Fixing-share-sj-error
Fixing share JS error
Diffstat (limited to 'core')
-rw-r--r--core/js/share.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/core/js/share.js b/core/js/share.js
index 4c8fd874107..e59669cbc2b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -92,6 +92,7 @@ OC.Share={
}
}
if (shares) {
+ OC.Share.statuses[itemSource] = OC.Share.statuses[itemSource] || {};
OC.Share.statuses[itemSource]['link'] = link;
} else {
delete OC.Share.statuses[itemSource];
@@ -122,7 +123,12 @@ OC.Share={
callback(result.data);
}
} else {
- OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
+ if (result.data && result.data.message) {
+ var msg = result.data.message;
+ } else {
+ var msg = t('core', 'Error');
+ }
+ OC.dialogs.alert(msg, t('core', 'Error while sharing'));
}
});
},