diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-07 21:39:55 -0300 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-08 00:26:09 -0300 |
commit | 1d3618a9b47d3160af00992756a4487906e39bcb (patch) | |
tree | 9ab0d0b449229f4a470f57f337ce133ed9b48932 /actionpack/lib/action_controller | |
parent | f2f63bf2ffa00d6187405c5851713d9fee68d5d3 (diff) | |
download | rails-1d3618a9b47d3160af00992756a4487906e39bcb.tar.gz rails-1d3618a9b47d3160af00992756a4487906e39bcb.tar.bz2 rails-1d3618a9b47d3160af00992756a4487906e39bcb.zip |
remove warning: assigned but unused variable
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/caching/fragments.rb | 1 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/http_authentication.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb index 0be04b70a1..2bdb23c4d7 100644 --- a/actionpack/lib/action_controller/caching/fragments.rb +++ b/actionpack/lib/action_controller/caching/fragments.rb @@ -109,7 +109,6 @@ module ActionController #:nodoc: def expire_fragment(key, options = nil) return unless cache_configured? key = fragment_cache_key(key) unless key.is_a?(Regexp) - message = nil instrument_fragment_cache :expire_fragment, key do if key.is_a?(Regexp) diff --git a/actionpack/lib/action_controller/metal/http_authentication.rb b/actionpack/lib/action_controller/metal/http_authentication.rb index 6d0c163a9e..7420a5e7e9 100644 --- a/actionpack/lib/action_controller/metal/http_authentication.rb +++ b/actionpack/lib/action_controller/metal/http_authentication.rb @@ -423,7 +423,7 @@ module ActionController # Returns an Array of [String, Hash] if a token is present. # Returns nil if no token is found. def token_and_options(request) - if header = request.authorization.to_s[/^Token (.*)/] + if request.authorization.to_s[/^Token (.*)/] values = Hash[$1.split(',').map do |value| value.strip! # remove any spaces between commas and values key, value = value.split(/\=\"?/) # split key=value pairs |