diff options
author | José Valim <jose.valim@gmail.com> | 2010-01-26 14:58:00 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-01-26 14:58:00 +0100 |
commit | f8bf1982dff9cf0f35fb7a121932c794ecdc1cb1 (patch) | |
tree | 04145ec0b4a3dae8d55bb3f31ce533708a015f20 /railties/lib/rails/railtie.rb | |
parent | 7adb1ffc038e06a1c95030856859e183b181f94a (diff) | |
download | rails-f8bf1982dff9cf0f35fb7a121932c794ecdc1cb1.tar.gz rails-f8bf1982dff9cf0f35fb7a121932c794ecdc1cb1.tar.bz2 rails-f8bf1982dff9cf0f35fb7a121932c794ecdc1cb1.zip |
Add tests for explicit engines.
Diffstat (limited to 'railties/lib/rails/railtie.rb')
-rw-r--r-- | railties/lib/rails/railtie.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/railties/lib/rails/railtie.rb b/railties/lib/rails/railtie.rb index 3cf358d75f..c038d0ac70 100644 --- a/railties/lib/rails/railtie.rb +++ b/railties/lib/rails/railtie.rb @@ -17,7 +17,7 @@ module Rails def inherited(base) unless abstract_railtie?(base) - base.send(:include, self::Configurable) if add_configurable?(base) + base.send(:include, self::Configurable) subclasses << base end end @@ -53,14 +53,6 @@ module Rails def abstract_railtie?(base) ABSTRACT_RAILTIES.include?(base.name) end - - # Just add configurable behavior if a Configurable module is defined - # and the class is a direct child from self. This is required to avoid - # application or plugins getting class configuration method from Railties - # and/or Engines. - def add_configurable?(base) - defined?(self::Configurable) && base.ancestors[1] == self - end end def rake_tasks |