diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-02-07 21:50:46 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-02-07 21:50:46 +0000 |
| commit | 3335bd12c8b3fbfe33ceda4b4f2f33ef023571da (patch) | |
| tree | 8e257d33eeaf92629c4c3435cee61347755245cb /activesupport/lib/active_support/core_ext/hash | |
| parent | fbd7ec3c9f0b1a5327ead66e0ac11b1d1d509f70 (diff) | |
| download | rails-3335bd12c8b3fbfe33ceda4b4f2f33ef023571da.tar.gz rails-3335bd12c8b3fbfe33ceda4b4f2f33ef023571da.tar.bz2 rails-3335bd12c8b3fbfe33ceda4b4f2f33ef023571da.zip | |
ActiveSupport::Base64.encode64s since Base64 is deprecated
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/conversions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb index 8e80f6e4ff..470537fe24 100644 --- a/activesupport/lib/active_support/core_ext/hash/conversions.rb +++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb @@ -77,9 +77,9 @@ module ActiveSupport #:nodoc: "boolean" => Proc.new { |boolean| %w(1 true).include?(boolean.strip) }, "string" => Proc.new { |string| string.to_s }, "yaml" => Proc.new { |yaml| YAML::load(yaml) rescue yaml }, - "base64Binary" => Proc.new { |bin| Base64.decode64(bin) }, + "base64Binary" => Proc.new { |bin| ActiveSupport::Base64.decode64(bin) }, "file" => Proc.new do |file, entity| - f = StringIO.new(Base64.decode64(file)) + f = StringIO.new(ActiveSupport::Base64.decode64(file)) f.extend(FileLike) f.original_filename = entity['name'] f.content_type = entity['content_type'] |