Apply the rest of Chads patch

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6180 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 9 insertions, 9 deletions

diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
index 759850f6bf..df622f7eee 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
@@ -81,12 +81,12 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.dependency 'model', [singular_name], :collision => :skip, :skip_migration => true
 
       # Scaffolded forms.
-      m.complex_template "form.rhtml",
+      m.complex_template "form.erb",
         File.join('app/views',
                   controller_class_path,
                   controller_file_name,
-                  "_form.rhtml"),
-        :insert => 'form_scaffolding.rhtml',
+                  "_form.erb"),
+        :insert => 'form_scaffolding.erb',
         :sandbox => lambda { create_sandbox },
         :begin_mark => 'form',
         :end_mark => 'eoform',
@@ -95,11 +95,11 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
 
       # Scaffolded views.
       scaffold_views.each do |action|
-        m.template "view_#{action}.rhtml",
+        m.template "view_#{action}.erb",
                    File.join('app/views',
                              controller_class_path,
                              controller_file_name,
-                             "#{action}.rhtml"),
+                             "#{action}.erb"),
                    :assigns => { :action => action }
       end
 
@@ -120,10 +120,10 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
                             "#{controller_file_name}_helper.rb")
 
       # Layout and stylesheet.
-      m.template 'layout.rhtml',
+      m.template 'layout.erb',
                   File.join('app/views/layouts',
                             controller_class_path,
-                            "#{controller_file_name}.rhtml")
+                            "#{controller_file_name}.erb")
 
       m.template 'style.css',     'public/stylesheets/scaffold.css'
 
@@ -133,8 +133,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
         path = File.join('app/views',
                           controller_class_path,
                           controller_file_name,
-                          "#{action}.rhtml")
-        m.template "controller:view.rhtml", path,
+                          "#{action}.erb")
+        m.template "controller:view.erb", path,
                    :assigns => { :action => action, :path => path}
       end
     end