Commit 853cc8ef357b5eeb2d25cf586fb96bbeab36a785

Authored by Victor Costa
2 parents a0ef4f25 3b1f8018

Merge branch 'fix_lazy_queries' into stable

Conflicts:
	app/models/comment.rb
app/controllers/public/content_viewer_controller.rb
... ... @@ -260,7 +260,7 @@ class ContentViewerController < ApplicationController
260 260 end
261 261  
262 262 def process_comments(params)
263   - @comments = @page.comments.without_spam.includes(:source)
  263 + @comments = @page.comments.without_spam
264 264 @comments = @plugins.filter(:unavailable_comments, @comments)
265 265 @comments_count = @comments.count
266 266 @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )
... ...