From 361b3fb07a0c95b4621266ddcf0524e8e13a8c80 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Sat, 24 Jan 2015 00:07:39 +0100 Subject: [PATCH] FIX: Loading of Emoji files depended on working directory The importer scripts could not be used unless the working directory was the Discourse root directory. --- app/models/emoji.rb | 2 +- lib/pretty_text.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/emoji.rb b/app/models/emoji.rb index 8c787e57448..43056fac064 100644 --- a/app/models/emoji.rb +++ b/app/models/emoji.rb @@ -65,7 +65,7 @@ class Emoji end def self.db_file - "lib/emoji/db.json" + "#{Rails.root}/lib/emoji/db.json" end def self.load_standard diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index f47b54d9f78..6908c6073f4 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -75,14 +75,14 @@ module PrettyText "app/assets/javascripts/discourse/lib/markdown.js" ) - Dir["#{Rails.root}/app/assets/javascripts/discourse/dialects/**.js"].sort.each do |dialect| + Dir["#{app_root}/app/assets/javascripts/discourse/dialects/**.js"].sort.each do |dialect| unless dialect =~ /\/dialect\.js$/ ctx.load(dialect) end end # custom emojis - emoji = ERB.new(File.read("app/assets/javascripts/discourse/lib/emoji/emoji.js.erb")) + emoji = ERB.new(File.read("#{app_root}/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb")) ctx.eval(emoji.result) Emoji.custom.each do |emoji|