diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-21 12:51:53 +0200 |
| commit | 33048b6e2738ff73b612dbcb35955189221dfbd0 (patch) | |
| tree | 7e32f6031199c1e7ee9a3e5a15789b5f568a565d /actionpack/lib/action_controller/routing | |
| parent | edda0bfe76fc9b2adcdb705665aaef2769e6ef03 (diff) | |
| parent | 9d7aae710384fb5f04129c35b86c5ea5fb9d83a9 (diff) | |
| download | rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.gz rails-33048b6e2738ff73b612dbcb35955189221dfbd0.tar.bz2 rails-33048b6e2738ff73b612dbcb35955189221dfbd0.zip | |
Solving merge conflicts.
Diffstat (limited to 'actionpack/lib/action_controller/routing')
| -rw-r--r-- | actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb b/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb index c6f7de17bd..159d869a54 100644 --- a/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb +++ b/actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb @@ -77,6 +77,7 @@ module ActionController end record = extract_record(record_or_hash_or_array) + record = record.to_model if record.respond_to?(:to_model) namespace = extract_namespace(record_or_hash_or_array) args = case record_or_hash_or_array |