diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-19 18:54:16 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-19 18:54:16 +0000 |
| commit | 3a057ea4ac9eed5b8ef8aaa9722b8eace1260306 (patch) | |
| tree | da60c31dd1cbec2251fb5e9f1082b9c50849259d /actionpack | |
| parent | 45ee71af3c992ce6905a0a7a074da3d75e83e3d9 (diff) | |
| download | rails-3a057ea4ac9eed5b8ef8aaa9722b8eace1260306.tar.gz rails-3a057ea4ac9eed5b8ef8aaa9722b8eace1260306.tar.bz2 rails-3a057ea4ac9eed5b8ef8aaa9722b8eace1260306.zip | |
Faster action_exempted? #1231 [skaen]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1324 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -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 |