Commit baa2faf8ada190c0255b2aaedd49d61ff655556b
Exists in
master
and in
13 other branches
Merge remote-tracking branch 'origin/master'
Showing
3 changed files
with
6 additions
and
2 deletions
Show diff stats
app/helpers/application_helper.rb
| @@ -1241,7 +1241,7 @@ module ApplicationHelper | @@ -1241,7 +1241,7 @@ module ApplicationHelper | ||
| 1241 | end | 1241 | end |
| 1242 | 1242 | ||
| 1243 | def cache_timeout(key, timeout, &block) | 1243 | def cache_timeout(key, timeout, &block) |
| 1244 | - cache(key, { :expires_in => timeout }, &block) | 1244 | + cache(key, { :expires_in => timeout, :skip_digest => true }, &block) |
| 1245 | end | 1245 | end |
| 1246 | 1246 | ||
| 1247 | def is_cache_expired?(key) | 1247 | def is_cache_expired?(key) |
app/models/block.rb
| @@ -235,7 +235,7 @@ class Block < ActiveRecord::Base | @@ -235,7 +235,7 @@ class Block < ActiveRecord::Base | ||
| 235 | 235 | ||
| 236 | alias :active_record_cache_key :cache_key | 236 | alias :active_record_cache_key :cache_key |
| 237 | def cache_key(language='en', user=nil) | 237 | def cache_key(language='en', user=nil) |
| 238 | - active_record_cache_key+'-'+language | 238 | + active_record_cache_key + '-' + language |
| 239 | end | 239 | end |
| 240 | 240 | ||
| 241 | def timeout | 241 | def timeout |
plugins/event/lib/event_plugin/event_block.rb
| @@ -81,4 +81,8 @@ class EventPlugin::EventBlock < Block | @@ -81,4 +81,8 @@ class EventPlugin::EventBlock < Block | ||
| 81 | content_tag(:span, date.year.to_s, :class => 'year') | 81 | content_tag(:span, date.year.to_s, :class => 'year') |
| 82 | end | 82 | end |
| 83 | 83 | ||
| 84 | + def self.expire_on | ||
| 85 | + { :profile => [:article], :environment => [:article] } | ||
| 86 | + end | ||
| 87 | + | ||
| 84 | end | 88 | end |