aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2013-09-18 02:33:44 -0700
committerMorris Jobke <morris.jobke@gmail.com>2013-09-18 02:33:44 -0700
commitb54e9be0acfe1c0d96d4e95037be47cda77ff2d0 (patch)
tree9296ee8a074f576c74d61dde443328ab2ee06eaf
parente0f18ec72b5e1dd02ece60a77fef94c643e535b1 (diff)
parent342a420ebada080f7575003c2e1937757b0df341 (diff)
downloadnextcloud-server-b54e9be0acfe1c0d96d4e95037be47cda77ff2d0.tar.gz
nextcloud-server-b54e9be0acfe1c0d96d4e95037be47cda77ff2d0.zip
Merge pull request #4889 from owncloud/disable_avatar_loading_on_public_upload_page
disable avatar loading on public guest page
-rw-r--r--core/js/avatar.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/core/js/avatar.js b/core/js/avatar.js
index 410182f01bf..57e6daa0930 100644
--- a/core/js/avatar.js
+++ b/core/js/avatar.js
@@ -1,7 +1,9 @@
$(document).ready(function(){
- $('#header .avatardiv').avatar(OC.currentUser, 32);
- // Personal settings
- $('#avatar .avatardiv').avatar(OC.currentUser, 128);
+ if (OC.currentUser) {
+ $('#header .avatardiv').avatar(OC.currentUser, 32);
+ // Personal settings
+ $('#avatar .avatardiv').avatar(OC.currentUser, 128);
+ }
// User settings
$.each($('td.avatar .avatardiv'), function(i, element) {
$(element).avatar($(element).parent().parent().data('uid'), 32);