aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-01 23:17:42 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-06-01 23:17:42 -0300
commitc87cce1ddfe2a68dd598bece49769f3f72322a28 (patch)
treeb57ed85c9479a1e3ec298dab40f2109a79bc1194 /actionpack
parentf40ccb54648717dea70ebfc96e2e438f93321ffa (diff)
parente1a7260640295642108a364c2cfa56b6868d9947 (diff)
downloadrails-c87cce1ddfe2a68dd598bece49769f3f72322a28.tar.gz
rails-c87cce1ddfe2a68dd598bece49769f3f72322a28.tar.bz2
rails-c87cce1ddfe2a68dd598bece49769f3f72322a28.zip
Merge pull request #20410 from schneems/schneems/boo-global-vars
Use block variable instead of global
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/journey/router/utils.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router/utils.rb b/actionpack/lib/action_dispatch/journey/router/utils.rb
index 2b0a6575d4..d02ed96d0d 100644
--- a/actionpack/lib/action_dispatch/journey/router/utils.rb
+++ b/actionpack/lib/action_dispatch/journey/router/utils.rb
@@ -55,7 +55,7 @@ module ActionDispatch
def unescape_uri(uri)
encoding = uri.encoding == US_ASCII ? UTF_8 : uri.encoding
- uri.gsub(ESCAPED) { [$&[1, 2].hex].pack('C') }.force_encoding(encoding)
+ uri.gsub(ESCAPED) { |match| [match[1, 2].hex].pack('C') }.force_encoding(encoding)
end
protected