diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-05-29 17:03:23 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-29 17:03:23 -0500 |
| commit | 669fd84910586d4c791b6f5bf4320f68ac7845aa (patch) | |
| tree | ec246bdf6fe6fc61219c59837c4bec07ba19e267 /actionpack/lib/action_controller/new_base/render_options.rb | |
| parent | c7c35be8fe30b3e29a5d05edae767f7d6a286911 (diff) | |
| download | rails-669fd84910586d4c791b6f5bf4320f68ac7845aa.tar.gz rails-669fd84910586d4c791b6f5bf4320f68ac7845aa.tar.bz2 rails-669fd84910586d4c791b6f5bf4320f68ac7845aa.zip | |
AS::Concern redefines "include" to lazy include modules as dependencies
Diffstat (limited to 'actionpack/lib/action_controller/new_base/render_options.rb')
| -rw-r--r-- | actionpack/lib/action_controller/new_base/render_options.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/new_base/render_options.rb index 04b954134f..fc9a02626f 100644 --- a/actionpack/lib/action_controller/new_base/render_options.rb +++ b/actionpack/lib/action_controller/new_base/render_options.rb @@ -39,7 +39,7 @@ module ActionController module RenderOption #:nodoc: def self.extended(base) base.extend ActiveSupport::Concern - base.depends_on ::ActionController::RenderOptions + base.send :include, ::ActionController::RenderOptions def base.register_renderer(name) included { _add_render_option(name) } @@ -94,10 +94,10 @@ module ActionController module All extend ActiveSupport::Concern - depends_on ActionController::Renderers::Json - depends_on ActionController::Renderers::Js - depends_on ActionController::Renderers::Xml - depends_on ActionController::Renderers::RJS + include ActionController::Renderers::Json + include ActionController::Renderers::Js + include ActionController::Renderers::Xml + include ActionController::Renderers::RJS end end end |