diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 4789429..9c3171f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1241,7 +1241,7 @@ module ApplicationHelper end def cache_timeout(key, timeout, &block) - cache(key, { :expires_in => timeout }, &block) + cache(key, { :expires_in => timeout, :skip_digest => true }, &block) end def is_cache_expired?(key) diff --git a/app/models/block.rb b/app/models/block.rb index dcd17d8..c6d8f44 100644 --- a/app/models/block.rb +++ b/app/models/block.rb @@ -235,7 +235,7 @@ class Block < ActiveRecord::Base alias :active_record_cache_key :cache_key def cache_key(language='en', user=nil) - active_record_cache_key+'-'+language + active_record_cache_key + '-' + language end def timeout diff --git a/plugins/event/lib/event_plugin/event_block.rb b/plugins/event/lib/event_plugin/event_block.rb index a52f59c..2d0b221 100644 --- a/plugins/event/lib/event_plugin/event_block.rb +++ b/plugins/event/lib/event_plugin/event_block.rb @@ -81,4 +81,8 @@ class EventPlugin::EventBlock < Block content_tag(:span, date.year.to_s, :class => 'year') end + def self.expire_on + { :profile => [:article], :environment => [:article] } + end + end -- libgit2 0.21.2