diff options
| author | Eugene Pimenov <libc@rghost.net> | 2008-04-18 15:45:33 +0400 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-04-23 20:19:22 +1200 |
| commit | e6a3ce3392812f707b78d64ffb04ee52f4517d20 (patch) | |
| tree | 17cac338027788a877e79314354a4c8777025af6 /actionpack/lib/action_controller/resources.rb | |
| parent | b6aa0e13b4e590b82550a6464924f431e57229df (diff) | |
| download | rails-e6a3ce3392812f707b78d64ffb04ee52f4517d20.tar.gz rails-e6a3ce3392812f707b78d64ffb04ee52f4517d20.tar.bz2 rails-e6a3ce3392812f707b78d64ffb04ee52f4517d20.zip | |
Make sure member names aren't mistakenly set to nil when providing :path_names
[#19 state:resolved]
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Diffstat (limited to 'actionpack/lib/action_controller/resources.rb')
| -rw-r--r-- | actionpack/lib/action_controller/resources.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/resources.rb b/actionpack/lib/action_controller/resources.rb index df7d6ead1b..d3cedfdac7 100644 --- a/actionpack/lib/action_controller/resources.rb +++ b/actionpack/lib/action_controller/resources.rb @@ -527,7 +527,7 @@ module ActionController action_path = action if resource.options[:path_names] action_path = resource.options[:path_names][action] - action_path ||= Base.resources_path_names[action] + action_path ||= Base.resources_path_names[action] || action end map.named_route("#{action}_#{resource.name_prefix}#{resource.singular}", "#{resource.member_path}#{resource.action_separator}#{action_path}", action_options) |