diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/session/mem_cache_store.rb | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 3bc5797800..6c747deb11 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Use #require_library_or_gem to load the memcache library for the MemCache session and fragment cache stores. Closes #8662. [Rick] + * Move ActionController::Routing.optimise_named_routes to ActionController::Base.optimise_named_routes. Now you can set it in the config. [Rick] config.action_controller.optimise_named_routes = false diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index a072080849..d04979644b 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -485,6 +485,7 @@ module ActionController #:nodoc: end end + require_library_or_gem 'memcache' class MemCacheStore < MemoryStore #:nodoc: attr_reader :addresses diff --git a/actionpack/lib/action_controller/session/mem_cache_store.rb b/actionpack/lib/action_controller/session/mem_cache_store.rb index e62c0ef9cd..6fd3ed7c7b 100644 --- a/actionpack/lib/action_controller/session/mem_cache_store.rb +++ b/actionpack/lib/action_controller/session/mem_cache_store.rb @@ -9,7 +9,7 @@ begin require 'cgi/session' - require 'memcache' + require_library_or_gem 'memcache' class CGI class Session |