summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-06-05 13:04:30 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2014-06-05 13:04:30 +0200
commite34b51124b9bb0a7fdc2a501c7922254f41029d6 (patch)
treee35f875a17e84323a439f81399d46d9bd969fc00
parentf955209a5ab028a3cb68eb804323f08623099b03 (diff)
parent690e0b50701eca4d1af3402bdd51e13c3f5a9e7e (diff)
downloadnextcloud-server-e34b51124b9bb0a7fdc2a501c7922254f41029d6.tar.gz
nextcloud-server-e34b51124b9bb0a7fdc2a501c7922254f41029d6.zip
Merge pull request #8894 from owncloud/public-share-js-overwrite
Dont overwrite OCA.Sharing
-rw-r--r--apps/files_sharing/js/public.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 27e8d361ff9..a2248405d22 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -10,7 +10,9 @@
/* global FileActions, Files */
/* global dragOptions, folderDropOptions */
-OCA.Sharing = {};
+if (!OCA.Sharing) {
+ OCA.Sharing = {};
+}
if (!OCA.Files) {
OCA.Files = {};
}