Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: avatar_template when using relative_url_root

This commit is contained in:
Neil Lalonde 2015-04-28 20:58:46 -04:00
parent 3252bf1252
commit b2fd69a675
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.rb
View File

@ -415,11 +415,11 @@ class User < ActiveRecord::Base
return letter_avatar_template(username) if !uploaded_avatar_id return letter_avatar_template(username) if !uploaded_avatar_id
id = uploaded_avatar_id id = uploaded_avatar_id
username ||= "" username ||= ""
"/user_avatar/#{RailsMultisite::ConnectionManagement.current_hostname}/#{username.downcase}/{size}/#{id}.png" "#{Discourse.base_uri}/user_avatar/#{RailsMultisite::ConnectionManagement.current_hostname}/#{username.downcase}/{size}/#{id}.png"
end end
def self.letter_avatar_template(username) def self.letter_avatar_template(username)
"/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png"
end end
def avatar_template def avatar_template