Merge 8ea667a into ffa3a71

kandanapp · May 7, 2014 · 6b5fb59 · 6b5fb59
2 parents ffa3a71 + 8ea667a
commit 6b5fb59
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
@@ -27,6 +27,8 @@ def index
     # NOTE if the action is accessed then there's definitely activities, so skip check for #first to be nil
     more_activities = first_activity_id < (activities.last.try(:id).presence || 1)
 
+    activities.each { |a| a.user ||= User.deleted_user }
+
     respond_to do |format|
       format.json { render :text => {:activities => activities.reverse, :more_activities => more_activities }.to_json(:include => :user) }
     end