@@ -53,11 +53,8 @@ See ActionController::Base for explanations of the rest of the options. The <tt> # Interlock.say key, "is rendering" @cached_content_for, previous_cached_content_for = {}, @cached_content_for - ::ActionView::TemplateHandlers::ERB.new(@controller).cache_fragment( - block, - key, - :ttl => (options.value_for_indifferent_key(:ttl) or Interlock.config[:ttl]) - ) + + cache key, :ttl => (options.value_for_indifferent_key(:ttl) or Interlock.config[:ttl]), &block # This is tricky. If we were already caching content_fors in a parent block, we need to # append the content_fors set in the inner block to those already set in the outer block. lib/interlock/action_view.rb f2cac364ee0d4ecd4f183f8f99925647844fa4a3 Brendan Baldwin github@brendanbaldwin.com http://github.com/fauna/interlock/commit/ad9926eb5796f0bd5c46972c752ad3c342fa838a ad9926eb5796f0bd5c46972c752ad3c342fa838a 2009-02-01T14:48:35-08:00 2009-02-01T14:27:50-08:00 Check it out, now Interlock works with Rails EDGE. Signed-off-by: Snax Fauna <evan+fauna@cloudbur.st> 47063f53c9b70dddfc490b0e4996309bbe5f92fc Snax Fauna evan+fauna@cloudbur.st