diff options
author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-23 02:42:17 -0800 |
---|---|---|
committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-01-23 02:42:17 -0800 |
commit | 70d81b319e5c18004065eba9e425041f48d24671 (patch) | |
tree | 2a69d8a7de053a68c20aba4c3c449e05a4f8677d /activesupport | |
parent | ede01ce8b27c752de66dcb96aa9b8d3a29e61111 (diff) | |
parent | 44319eff4aa6494e1eb383aa767948b20592da04 (diff) | |
download | rails-70d81b319e5c18004065eba9e425041f48d24671.tar.gz rails-70d81b319e5c18004065eba9e425041f48d24671.tar.bz2 rails-70d81b319e5c18004065eba9e425041f48d24671.zip |
Merge pull request #4611 from jviney/3-2-stable
Fix ActiveSupport::Base64.decode64
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/base64.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/base64.rb b/activesupport/lib/active_support/base64.rb index bb4c955eea..61a4af1a87 100644 --- a/activesupport/lib/active_support/base64.rb +++ b/activesupport/lib/active_support/base64.rb @@ -40,7 +40,7 @@ module ActiveSupport def self.decode64(value) ActiveSupport::Deprecation.warn "ActiveSupport::Base64.decode64 " \ "is deprecated. Use Base64.decode64 instead", caller - ::Base64.encode64(value) + ::Base64.decode64(value) end def self.encode64s(value) |