From 22ae0c595ed9ed0d9a88b65d0a319c046d04b7f9 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 11 Nov 2015 11:52:57 -0200
Subject: [PATCH] Close #1222; Fix shared variable with username info when
generate avatar
---
server/startup/avatar.coffee | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/startup/avatar.coffee b/server/startup/avatar.coffee
index 142bc327f18..387fed26d88 100644
--- a/server/startup/avatar.coffee
+++ b/server/startup/avatar.coffee
@@ -29,13 +29,13 @@ Meteor.startup ->
transformWrite: transformWrite
WebApp.connectHandlers.use '/avatar/', (req, res, next) ->
- this.params =
+ params =
username: decodeURIComponent(req.url.replace(/^\//, '').replace(/\?.*$/, ''))
- if this.params.username[0] isnt '@'
- file = RocketChatFileAvatarInstance.getFileWithReadStream this.params.username
+ if params.username[0] isnt '@'
+ file = RocketChatFileAvatarInstance.getFileWithReadStream params.username
else
- this.params.username = this.params.username.replace '@', ''
+ params.username = params.username.replace '@', ''
#console.log "[avatar] checking username #{@params.username} (derrived from path #{req.url})"
res.setHeader 'Content-Disposition', 'inline'
@@ -46,7 +46,7 @@ Meteor.startup ->
colors = ['#F44336','#E91E63','#9C27B0','#673AB7','#3F51B5','#2196F3','#03A9F4','#00BCD4','#009688','#4CAF50','#8BC34A','#CDDC39','#FFC107','#FF9800','#FF5722','#795548','#9E9E9E','#607D8B']
- username = @params.username.replace('.jpg', '')
+ username = params.username.replace('.jpg', '')
color = ''
initials = ''
if username is "?"
--
GitLab