diff options
| author | rick <rick@spacemonkey.local> | 2008-05-05 23:19:21 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-05 23:19:21 -0700 |
| commit | 0052938ac5b8894b27fdb9f27b1ed39f0a9ea176 (patch) | |
| tree | f714643a4043d9fb73b39ec2a114d18f5deeffdd /actionpack/lib/action_controller/routing/route.rb | |
| parent | eacb5cf0cab6447db78085c8bda6c94dd329ce6b (diff) | |
| parent | 3cffe92ff066c2b35eef409547db93652c5cccfc (diff) | |
| download | rails-0052938ac5b8894b27fdb9f27b1ed39f0a9ea176.tar.gz rails-0052938ac5b8894b27fdb9f27b1ed39f0a9ea176.tar.bz2 rails-0052938ac5b8894b27fdb9f27b1ed39f0a9ea176.zip | |
Merge commit 'core/master'
Diffstat (limited to 'actionpack/lib/action_controller/routing/route.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing/route.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/routing/route.rb b/actionpack/lib/action_controller/routing/route.rb index a83a599e35..a0d108ba03 100644 --- a/actionpack/lib/action_controller/routing/route.rb +++ b/actionpack/lib/action_controller/routing/route.rb @@ -139,8 +139,8 @@ module ActionController # those that were not used to generate a particular route. The extra # keys also do not include those recalled from the prior request, nor # do they include any keys that were implied in the route (like a - # :controller that is required, but not explicitly used in the text of - # the route.) + # <tt>:controller</tt> that is required, but not explicitly used in the + # text of the route.) def extra_keys(hash, recall={}) (hash || {}).keys.map { |k| k.to_sym } - (recall || {}).keys - significant_keys end |