aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/scaffolding.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 01:24:55 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 01:24:55 +0000
commit88a3343ed57c01ca358da8473d15fc4d2b4a5bff (patch)
tree3fe773bb113480f68eaea508d241cbaf90eebfde /actionpack/lib/action_controller/scaffolding.rb
parent60f7a5cab73fab032fdb73d1a9a8061cf20031d2 (diff)
downloadrails-88a3343ed57c01ca358da8473d15fc4d2b4a5bff.tar.gz
rails-88a3343ed57c01ca358da8473d15fc4d2b4a5bff.tar.bz2
rails-88a3343ed57c01ca358da8473d15fc4d2b4a5bff.zip
Backed out of routing merge.. investigating missing patches
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/scaffolding.rb')
-rw-r--r--actionpack/lib/action_controller/scaffolding.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/scaffolding.rb b/actionpack/lib/action_controller/scaffolding.rb
index 140df73972..9c1311efa3 100644
--- a/actionpack/lib/action_controller/scaffolding.rb
+++ b/actionpack/lib/action_controller/scaffolding.rb
@@ -149,7 +149,7 @@ module ActionController
private
def render#{suffix}_scaffold(action = caller_method_name(caller))
- if template_exists?("\#{self.class.controller_path}/\#{action}")
+ if template_exists?("\#{controller_name}/\#{action}")
render_action(action)
else
@scaffold_class = #{class_name}