diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/filters.rb | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 51306db495..90d69207e6 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added Serbia and Montenegro to the country_select #1239 [todd@robotcoop.com] + * Fixed Request#remote_ip in testing #1251 [bitsweat] * Fixed that compute_public_path should recognize external URLs, so image_tag("http://www.example.com/images/icon.gif") is not prefixed with the relative url path #1254 [victor-ronr-trac@carotena.net] diff --git a/actionpack/lib/action_controller/filters.rb b/actionpack/lib/action_controller/filters.rb index 02c705a2b4..1a2423b1e2 100644 --- a/actionpack/lib/action_controller/filters.rb +++ b/actionpack/lib/action_controller/filters.rb @@ -339,10 +339,10 @@ module ActionController #:nodoc: def action_exempted?(filter) case - when self.class.included_actions[filter] - !self.class.included_actions[filter].include?(action_name) - when self.class.excluded_actions[filter] - self.class.excluded_actions[filter].include?(action_name) + when ia = self.class.included_actions[filter] + !ia.include?(action_name) + when ea = self.class.excluded_actions[filter] + ea.include?(action_name) end end end |