diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-30 19:33:32 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-30 19:34:15 -0800 |
commit | 1fbd02e44618f1f56e1d9d0af85c6a4108a66532 (patch) | |
tree | 53c426130333053cf40e51b8bc00174876ecccc4 /railties/lib/rails/plugin.rb | |
parent | 10a2638db099baddfa46da98f780df3a72a718d4 (diff) | |
download | rails-1fbd02e44618f1f56e1d9d0af85c6a4108a66532.tar.gz rails-1fbd02e44618f1f56e1d9d0af85c6a4108a66532.tar.bz2 rails-1fbd02e44618f1f56e1d9d0af85c6a4108a66532.zip |
Revert "Add config.action_controller.include behavior to plugins."
This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e.
Conflicts:
railties/lib/rails/plugin.rb
Diffstat (limited to 'railties/lib/rails/plugin.rb')
-rw-r--r-- | railties/lib/rails/plugin.rb | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/railties/lib/rails/plugin.rb b/railties/lib/rails/plugin.rb index c64042cf7d..e154e9b706 100644 --- a/railties/lib/rails/plugin.rb +++ b/railties/lib/rails/plugin.rb @@ -40,24 +40,6 @@ module Rails rake_tasks.each { |blk| blk.call } end - # Creates an initializer which includes all given modules to the given class. - # - # module Rails - # class ActionController < Rails::Plugin - # plugin_name :action_controller - # include_modules_in "ActionController::Base" - # end - # end - # - def self.include_modules_in(klass, from=plugin_name) - self.initializer :"#{from}.include_modules" do |app| - klass = klass.constantize if klass.is_a?(String) - app.config.send(from).includes.each do |mod| - klass.send(:include, mod.is_a?(String) ? mod.constantize : mod) - end - end - end - class Vendored < Plugin def self.all(list, paths) plugins = [] @@ -121,4 +103,4 @@ module Rails end end end -end
\ No newline at end of file +end |