diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-16 21:50:13 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-16 21:50:13 -0200 |
| commit | ff5d60636878fee6135d44f48b2e1108a99f4eb0 (patch) | |
| tree | db5c97a35cc996fbfcae34542beb1e26bb9bac15 /actionpack/CHANGELOG.md | |
| parent | 0c7a236f30c12c981cf376d08ac01e423308533d (diff) | |
| download | rails-ff5d60636878fee6135d44f48b2e1108a99f4eb0.tar.gz rails-ff5d60636878fee6135d44f48b2e1108a99f4eb0.tar.bz2 rails-ff5d60636878fee6135d44f48b2e1108a99f4eb0.zip | |
Add changelog entry for #6003 backport
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 74ae690db0..e060937fac 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,20 @@ ## Rails 3.2.10 (unreleased) ## +* Fix side effect of `url_for` changing the `:controller` string option. [Backport #6003] + + Before: + + controller = '/projects' + url_for :controller => controller, :action => 'status' + + puts controller #=> 'projects' + + After + + puts controller #=> '/projects' + + [Nikita Beloglazov + Andrew White] + * Introduce `ActionView::Template::Handlers::ERB.escape_whitelist`. This is a list of mime types where template text is not html escaped by default. It prevents `Jack & Joe` from rendering as `Jack & Joe` for the whitelisted mime types. The default whitelist |