Download as
Browse Code »

Commit 853cc8ef357b5eeb2d25cf586fb96bbeab36a785

Authored by Victor Costa
2 parents a0ef4f25 3b1f8018
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'fix_lazy_queries' into stable 

Conflicts:
	app/models/comment.rb
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/controllers/public/content_viewer_controller.rb
  Diff comments   View file @853cc8e
@@ -260,7 +260,7 @@ class ContentViewerController < ApplicationController @@ -260,7 +260,7 @@ class ContentViewerController < ApplicationController
260 end 260 end
261 261
262 def process_comments(params) 262 def process_comments(params)
263 - @comments = @page.comments.without_spam.includes(:source) 263 + @comments = @page.comments.without_spam
264 @comments = @plugins.filter(:unavailable_comments, @comments) 264 @comments = @plugins.filter(:unavailable_comments, @comments)
265 @comments_count = @comments.count 265 @comments_count = @comments.count
266 @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] ) 266 @comments = @comments.without_reply.paginate(:per_page => per_page, :page => params[:comment_page] )