aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/engine.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails/engine.rb')
-rw-r--r--railties/lib/rails/engine.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 49553a57f3..85ff09d2af 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -256,11 +256,7 @@ module Rails
end
def config
- @config ||= begin
- config = Engine::Configuration.new(find_root_with_flag("lib"))
- config.asset_path = "/#{engine_name}%s" if File.exists?(config.paths.public.to_a.first)
- config
- end
+ @config ||= Engine::Configuration.new(find_root_with_flag("lib"))
end
# Add configured load paths to ruby load paths and remove duplicates.
@@ -335,6 +331,9 @@ module Rails
require environment if environment
end
+ initializer :default_asset_path do
+ config.asset_path = "/#{engine_name}%s" unless config.asset_path
+ end
protected
def find_root_with_flag(flag, default=nil)
root_path = self.class.called_from