From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 29 Dec 2010 19:37:42 +0000 (+0000)
Subject: Takes more parameters into account to determine activity freshness (#7188).
X-Git-Tag: 1.1.0~31
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e9a0e6dbc8bff4afbd299d23431944fbab453e17;p=redmine.git

Takes more parameters into account to determine activity freshness (#7188).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4579 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index ae6a67369..d6292ea9a 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -23,7 +23,7 @@ class ActivitiesController < ApplicationController
 
     events = @activity.events(@date_from, @date_to)
     
-    if events.empty? || stale?(:etag => [events.first, User.current])
+    if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])
       respond_to do |format|
         format.html { 
           @events_by_day = events.group_by(&:event_date)