aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-11-26 10:28:36 -0800
committerJosé Valim <jose.valim@gmail.com>2011-11-26 10:28:36 -0800
commit140a0e49e51fd9491dfc2d55943b20983e4dcfe5 (patch)
tree4ff7766bf32345bfa958beea67fbceb585ed84f4 /railties
parentd157ca881bce317c50ad085082ba4b609174ebbe (diff)
parent89d6db05d74ba8cb1d99aaa2166f02dd67a34a36 (diff)
downloadrails-140a0e49e51fd9491dfc2d55943b20983e4dcfe5.tar.gz
rails-140a0e49e51fd9491dfc2d55943b20983e4dcfe5.tar.bz2
rails-140a0e49e51fd9491dfc2d55943b20983e4dcfe5.zip
Merge pull request #3763 from qoobaa/orm-instance-fix
allow using orm_instance without invoking orm_class in generators
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/resource_helpers.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/resource_helpers.rb b/railties/lib/rails/generators/resource_helpers.rb
index b34bc4a524..f2195cb81a 100644
--- a/railties/lib/rails/generators/resource_helpers.rb
+++ b/railties/lib/rails/generators/resource_helpers.rb
@@ -73,7 +73,7 @@ module Rails
# Initialize ORM::Generators::ActiveModel to access instance methods.
def orm_instance(name=singular_table_name)
- @orm_instance ||= @orm_class.new(name)
+ @orm_instance ||= orm_class.new(name)
end
end
end