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

Merge pull request #4633 from xfalcox/resize-emoji-full-path 

FIX: Use full path for emoji resize job
This commit is contained in:
Guo Xiang Tan 2017-01-03 14:00:00 +08:00 committed by GitHub
parent 980cea7081 9ee67ad89c
commit 8a4e9c1940
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/emoji.rb
View File

@ -66,6 +66,7 @@ class Emoji
def self.create_for(file, name) def self.create_for(file, name)
extension = File.extname(file.original_filename) extension = File.extname(file.original_filename)
path = "#{Emoji.base_directory}/#{name}#{extension}" path = "#{Emoji.base_directory}/#{name}#{extension}"
full_path = "#{Rails.root}/#{path}"
# store the emoji # store the emoji
FileUtils.mkdir_p(Pathname.new(path).dirname) FileUtils.mkdir_p(Pathname.new(path).dirname)
@ -73,7 +74,7 @@ class Emoji
# clear the cache # clear the cache
Emoji.clear_cache Emoji.clear_cache
# launch resize job # launch resize job
Jobs.enqueue(:resize_emoji, path: path) Jobs.enqueue(:resize_emoji, path: full_path)
# return created emoji # return created emoji
Emoji[name] Emoji[name]
end end