Permalink
Browse files

Faster action_exempted? #1231 [skaen]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1324 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed May 19, 2005
1 parent 45ee71a commit 3a057ea4ac9eed5b8ef8aaa9722b8eace1260306
Showing with 6 additions and 4 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +4 −4 actionpack/lib/action_controller/filters.rb
View
@@ -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]
@@ -339,10 +339,10 @@ def filter_class?(filter)
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

0 comments on commit 3a057ea

Please sign in to comment.