diff options
| author | Uriel Katz <uriel.katz@gmail.com> | 2012-11-17 02:05:53 +0200 |
|---|---|---|
| committer | Uriel Katz <uriel.katz@gmail.com> | 2012-12-01 14:00:16 +0200 |
| commit | 9ee0ffb3602720fceaecc2fbae1c932341482e31 (patch) | |
| tree | 9a3f7c9fab2bfce6c1ceb136e72be133f58fc8df /activesupport/lib/active_support/cache | |
| parent | 005d910624bbfa724b638426a000c8074d4201a2 (diff) | |
| download | rails-9ee0ffb3602720fceaecc2fbae1c932341482e31.tar.gz rails-9ee0ffb3602720fceaecc2fbae1c932341482e31.tar.bz2 rails-9ee0ffb3602720fceaecc2fbae1c932341482e31.zip | |
Patched Marshal#load to work with constant autoloading (active_support/dependecies.rb) (issue #8167)
Diffstat (limited to 'activesupport/lib/active_support/cache')
| -rw-r--r-- | activesupport/lib/active_support/cache/file_store.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/cache/mem_cache_store.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/cache/file_store.rb b/activesupport/lib/active_support/cache/file_store.rb index 2c1ad60d44..8e265ad863 100644 --- a/activesupport/lib/active_support/cache/file_store.rb +++ b/activesupport/lib/active_support/cache/file_store.rb @@ -1,3 +1,4 @@ +require 'active_support/core_ext/marshal' require 'active_support/core_ext/file/atomic' require 'active_support/core_ext/string/conversions' require 'uri/common' diff --git a/activesupport/lib/active_support/cache/mem_cache_store.rb b/activesupport/lib/active_support/cache/mem_cache_store.rb index 17450fe4d0..712db2c75a 100644 --- a/activesupport/lib/active_support/cache/mem_cache_store.rb +++ b/activesupport/lib/active_support/cache/mem_cache_store.rb @@ -6,6 +6,7 @@ rescue LoadError => e end require 'digest/md5' +require 'active_support/core_ext/marshal' module ActiveSupport module Cache |