aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-09-14 01:35:44 +0200
committerXavier Noria <fxn@hashref.com>2010-09-14 01:35:44 +0200
commit0207bc7cc980e3f1d15fc59f611eff05e2e35035 (patch)
tree1e546402d164bfa2b47da913a60fb3f925b9b70f /railties
parentd8d8334a0be51e8c34876699d9101bf390761f11 (diff)
downloadrails-0207bc7cc980e3f1d15fc59f611eff05e2e35035.tar.gz
rails-0207bc7cc980e3f1d15fc59f611eff05e2e35035.tar.bz2
rails-0207bc7cc980e3f1d15fc59f611eff05e2e35035.zip
get csrf_meta_tag back to the generated layout in deference to existing printed material, chomp also the generated HTML to be faithful to the output before the refactor
Diffstat (limited to 'railties')
-rw-r--r--railties/guides/source/getting_started.textile2
-rw-r--r--railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt2
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile
index 9eae712a93..92b9131b59 100644
--- a/railties/guides/source/getting_started.textile
+++ b/railties/guides/source/getting_started.textile
@@ -559,7 +559,7 @@ The view is only part of the story of how HTML is displayed in your web browser.
<title>Blog</title>
<%= stylesheet_link_tag :all %>
<%= javascript_include_tag :defaults %>
- <%= csrf_meta_tags %>
+ <%= csrf_meta_tag %>
</head>
<body style="background: #EEEEEE;">
diff --git a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
index 1de78eecae..1dd112b4a6 100644
--- a/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -4,7 +4,7 @@
<title><%= app_const_base %></title>
<%%= stylesheet_link_tag :all %>
<%%= javascript_include_tag :defaults %>
- <%%= csrf_meta_tags %>
+ <%%= csrf_meta_tag %>
</head>
<body>