diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-09-01 15:45:43 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-09-01 15:45:43 -0300 |
| commit | 39e4e76d15233bb1cb0b778d920f54efe86bb4f0 (patch) | |
| tree | 7e9cab343139c79acc36715f4f24c579a207fbc6 /railties/builtin/rails_info/rails/info.rb | |
| parent | 6b67df70ab1bc42d9a05571144cdf5614a7d4a6a (diff) | |
| parent | da636809daca9c338200811d3590e446f57c8e81 (diff) | |
| download | rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.tar.gz rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.tar.bz2 rails-39e4e76d15233bb1cb0b778d920f54efe86bb4f0.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/associations.rb
Diffstat (limited to 'railties/builtin/rails_info/rails/info.rb')
| -rw-r--r-- | railties/builtin/rails_info/rails/info.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/builtin/rails_info/rails/info.rb b/railties/builtin/rails_info/rails/info.rb index fdacc469f5..aabe976d4e 100644 --- a/railties/builtin/rails_info/rails/info.rb +++ b/railties/builtin/rails_info/rails/info.rb @@ -29,8 +29,10 @@ module Rails end def framework_version(framework) - require "#{framework}/version" - "#{framework.classify}::VERSION::STRING".constantize + if Object.const_defined?(framework.classify) + require "#{framework}/version" + "#{framework.classify}::VERSION::STRING".constantize + end end def edge_rails_revision(info = git_info) |