diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 7 | ||||
| -rw-r--r-- | app/views/general/frontpage.html.erb | 2 | ||||
| -rw-r--r-- | app/views/request/_sidebar.html.erb | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index e3b1e57ac..0c346ab4e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -116,5 +116,12 @@ module ApplicationHelper return !session[:using_admin].nil? || (!@user.nil? && @user.super?) end + def cache_if_caching_fragments(*args, &block) + if AlaveteliConfiguration::cache_fragments + cache(*args) { yield } + else + yield + end + end end diff --git a/app/views/general/frontpage.html.erb b/app/views/general/frontpage.html.erb index 2900782ef..8bb32bdf2 100644 --- a/app/views/general/frontpage.html.erb +++ b/app/views/general/frontpage.html.erb @@ -1,4 +1,4 @@ -<% cache("frontpage-#{@locale}", :expires_in => 5.minutes) do %> +<% cache_if_caching_fragments("frontpage-#{@locale}", :expires_in => 5.minutes) do %> <div id="frontpage_splash"> <div id="left_column"> <%= render :partial => "frontpage_new_request" %> diff --git a/app/views/request/_sidebar.html.erb b/app/views/request/_sidebar.html.erb index 71405ae06..8400cd6ac 100644 --- a/app/views/request/_sidebar.html.erb +++ b/app/views/request/_sidebar.html.erb @@ -51,7 +51,7 @@ <%= render :partial => 'request/next_actions' %> - <% cache(@similar_cache_key, :expires_in => 1.day) do %> + <% cache_if_caching_fragments(@similar_cache_key, :expires_in => 1.day) do %> <% xapian_similar, xapian_similar_more = @info_request.similar_requests %> <% if !xapian_similar.nil? && xapian_similar.results.size > 0 %> <h2><%= _('Similar requests')%></h2> |