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/configuration.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/configuration.rb')
-rw-r--r-- | railties/lib/rails/configuration.rb | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index cb321536d2..086f67a419 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -1,24 +1,6 @@ require 'active_support/ordered_options' module Rails - # Create a Plugin::Options from ActiveSuppot::OrderedOptions, - # which support the following syntax: - # - # controller.action_controller.include FooBar - # - class Plugin::Options < ActiveSupport::OrderedOptions #:nodoc: - attr_reader :includes - - def initialize(*args) - @includes = [] - super - end - - def include(*args) - @includes.concat(args) - end - end - # Temporarily separate the plugin configuration class from the main # configuration class while this bit is being cleaned up. class Plugin::Configuration @@ -34,7 +16,7 @@ module Rails @options = base.options.dup @middleware = base.middleware.dup else - @options = Hash.new { |h,k| h[k] = Rails::Plugin::Options.new } + @options = Hash.new { |h,k| h[k] = ActiveSupport::OrderedOptions.new } @middleware = ActionDispatch::MiddlewareStack.new end end |