Skip to content

Commit

Permalink
Gather initializers from railties in engines to get rid of additional…
Browse files Browse the repository at this point in the history
… looping through initializers
  • Loading branch information
drogus committed Sep 3, 2010
1 parent c787bfd commit 675f3ea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 10 deletions.
10 changes: 0 additions & 10 deletions railties/lib/rails/application/railties.rb
Expand Up @@ -16,16 +16,6 @@ def railties
def engines
@engines ||= ::Rails::Engine.subclasses.map(&:instance)
end

def plugins
@plugins ||= super + plugins_for_engines
end

def plugins_for_engines
engines.map { |e|
e.railties.plugins
}.flatten
end
end
end
end
7 changes: 7 additions & 0 deletions railties/lib/rails/engine.rb
Expand Up @@ -158,6 +158,13 @@ def call(env)
app.call(env)
end

def initializers
initializers = []
railties.all { |r| initializers += r.initializers }
initializers += super
initializers
end

# Add configured load paths to ruby load paths and remove duplicates.
initializer :set_load_path, :before => :bootstrap_hook do
_all_load_paths.reverse_each do |path|
Expand Down

0 comments on commit 675f3ea

Please sign in to comment.