diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-27 17:40:51 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-27 17:40:51 +0000 |
commit | 61cafca6eaca50c3dc5a46edd1becf0b35e78b54 (patch) | |
tree | 0767b6300e4aa30fdec329efa37e61898890b97d /actionpack/lib | |
parent | f871f33994e37806f038ed71cf610cbdd9e38756 (diff) | |
download | rails-61cafca6eaca50c3dc5a46edd1becf0b35e78b54.tar.gz rails-61cafca6eaca50c3dc5a46edd1becf0b35e78b54.tar.bz2 rails-61cafca6eaca50c3dc5a46edd1becf0b35e78b54.zip |
Disregard expire methods when the controller hasnt been set, which essentially makes it such that the record observer callbacks are ignored when the sweeper shouldnt be active
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_controller/caching.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index b6861cb081..0254c2d98d 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -469,6 +469,7 @@ module ActionController #:nodoc: end def method_missing(method, *arguments) + return if @controller.nil? @controller.send(method, *arguments) end end |