From: Tom Hughes <tom@compton.nu>
Date: Sat, 7 Jan 2012 15:43:27 +0000 (+0000)
Subject: Don't cache user specific diary entry lists
X-Git-Tag: live~5908
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f7df396cf2139cfc86d5759b5ef8716948bf4fa7

Don't cache user specific diary entry lists
---

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 2fd239a06..ff1976a82 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -8,8 +8,9 @@ class DiaryEntryController < ApplicationController
   before_filter :check_database_writable, :only => [:new, :edit]
   before_filter :require_administrator, :only => [:hide, :hidecomment]
 
-  caches_action :list, :view, :layout => false
+  caches_action :list, :layout => false, :unless => :user_specific_list?
   caches_action :rss, :layout => true
+  caches_action :view, :layout => false
   cache_sweeper :diary_sweeper, :only => [:new, :edit, :comment, :hide, :hidecomment]
 
   def new
@@ -204,4 +205,10 @@ private
       redirect_to :controller => 'diary_entry', :action => 'view', :display_name => params[:id]
     end
   end
+
+  ##
+  # is this list user specific?
+  def user_specific_list?
+    params[:friends] or params[:nearby]
+  end
 end