summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2016-11-14 17:14:09 +0100
committerGitHub <noreply@github.com>2016-11-14 17:14:09 +0100
commit42d754becd6fd968eebaa68a3f533c4385d2ced6 (patch)
tree206b18e222e28b97de544e3a9786de0afe3f4b56
parent561a4fd9892b7d365f871e79fcf910da200ba69e (diff)
parent1056692fff9baaa60c1e74c839574fdc0a9a7f35 (diff)
downloadnextcloud-server-42d754becd6fd968eebaa68a3f533c4385d2ced6.tar.gz
nextcloud-server-42d754becd6fd968eebaa68a3f533c4385d2ced6.zip
Merge pull request #2084 from nextcloud/files_drop_avatars_disabled
Fixes files_drop when avatars are disabled
-rw-r--r--apps/files_sharing/js/files_drop.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_sharing/js/files_drop.js b/apps/files_sharing/js/files_drop.js
index 64051844d03..f9f6959c952 100644
--- a/apps/files_sharing/js/files_drop.js
+++ b/apps/files_sharing/js/files_drop.js
@@ -117,7 +117,7 @@
};
$(document).ready(function() {
- if($('#upload-only-interface').val() === "1") {
+ if($('#upload-only-interface').val() === "1" && oc_config.enable_avatars) {
$('.avatardiv').avatar($('#sharingUserId').val(), 128, true);
}