mirror of
https://github.com/github/rails.git
synced 2026-02-17 01:21:42 -05:00
Faster action_exempted? #1231 [skaen]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1324 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
@@ -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 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user