diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-09-11 11:04:19 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-09-11 11:05:00 +0200 |
| commit | a87b92db7b738cf86deac15d69f4159b2f87d79e (patch) | |
| tree | 20cf6f72b45ed922ba0329b74d952b887635897c /railties | |
| parent | f6153f74da29f56017d5ddb8a2b8869d9b5835d7 (diff) | |
| download | rails-a87b92db7b738cf86deac15d69f4159b2f87d79e.tar.gz rails-a87b92db7b738cf86deac15d69f4159b2f87d79e.tar.bz2 rails-a87b92db7b738cf86deac15d69f4159b2f87d79e.zip | |
revises implementation and documentation of csrf_meta_tags, and aliases csrf_meta_tag to it for backwards compatibilty
Diffstat (limited to 'railties')
3 files changed, 3 insertions, 3 deletions
diff --git a/railties/guides/source/getting_started.textile b/railties/guides/source/getting_started.textile index 92b9131b59..9eae712a93 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_tag %> + <%= csrf_meta_tags %> </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 1dd112b4a6..1de78eecae 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_tag %> + <%%= csrf_meta_tags %> </head> <body> diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 6bf56f7052..7403d16cf4 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -211,7 +211,7 @@ module ApplicationTests protect_from_forgery def index - render :inline => "<%= csrf_meta_tag %>" + render :inline => "<%= csrf_meta_tags %>" end end |