From 622e4ab424ea260cd3ebe3768b1a2a4e5ae1384e Mon Sep 17 00:00:00 2001 From: Andrew White Date: Tue, 25 Jun 2013 11:00:19 +0100 Subject: Fix shorthand routes where controller and action are in the scope Merge `:action` from routing scope and assign endpoint if both `:controller` and `:action` are present. The endpoint assignment only occurs if there is no `:to` present in the options hash so should only affect routes using the shorthand syntax (i.e. endpoint is inferred from the the path). Fixes #9856 Backport of 37b4276 --- actionpack/CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'actionpack/CHANGELOG.md') diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 5508fb9453..ac260a9592 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,14 @@ ## unreleased ## +* Merge `:action` from routing scope and assign endpoint if both `:controller` + and `:action` are present. The endpoint assignment only occurs if there is + no `:to` present in the options hash so should only affect routes using the + shorthand syntax (i.e. endpoint is inferred from the the path). + + Fixes #9856 + + *Yves Senn*, *Andrew White* + * Always escape the result of `link_to_unless` method. Before: -- cgit v1.2.3