Discource-C/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-22 12:17:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: emoji upload on subfolder install

Browse Source
This commit is contained in:
Neil Lalonde 2015-08-21 16:42:37 -04:00
parent be17b3e04f
commit d8d18ee0c3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/emoji.rb
View File

@ -47,7 +47,7 @@ class Emoji
extension = File.extname(path) extension = File.extname(path)
Emoji.new(path).tap do |e| Emoji.new(path).tap do |e|
e.name = File.basename(path, ".*") e.name = File.basename(path, ".*")
e.url = "/#{base_url}/#{e.name}#{extension}" e.url = "#{base_url}/#{e.name}#{extension}"
end end
end end
@ -110,12 +110,12 @@ class Emoji
end end
def self.base_directory def self.base_directory
"public/#{base_url}" "public#{base_url}"
end end
def self.base_url def self.base_url
db = RailsMultisite::ConnectionManagement.current_db db = RailsMultisite::ConnectionManagement.current_db
"uploads/#{db}/_emoji" "#{Discourse.base_uri}/uploads/#{db}/_emoji"
end end
end end