Merge branch 'FX-alan-message-access-slow' into alan_develop

app/controllers/courses_controller.rb

@@ -902,10 +902,7 @@ class CoursesController < ApplicationController
   end
 
   def feedback
-    @course.journals_for_messages.each do |messages|
-      query = messages.course_messages.where("user_id = ?", User.current.id)
-      query.update_all(:viewed => true);
-    end
+    CourseMessage.where("user_id = ? and course_id = ?", User.current, @course.id).update_all(:viewed => true)
 
     if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       page = params[:page]