diff app/controllers/activities_controller.rb @ 1022:f2ec92061fca browsing

Merge from live branch

--- a/app/controllers/activities_controller.rb	Tue Nov 13 10:35:23 2012 +0000
+++ b/app/controllers/activities_controller.rb	Tue Nov 13 10:35:40 2012 +0000
@@ -44,6 +44,8 @@
     if !@institution_name.blank?
       events = events.select do |e|
         e.respond_to?(:event_author) and e.event_author and
+	  e.event_author.respond_to?(:ssamr_user_detail) and
+          !e.event_author.ssamr_user_detail.nil? and
           e.event_author.ssamr_user_detail.institution_name == @institution_name
       end
       if events.empty?