From 2da40dfc2b95afd96ccf7e03a376f2fbd684f827 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Wed, 15 Nov 2017 16:48:22 -0800 Subject: [PATCH] remove reference to currentuser when processing bulk reverts --- app/logical/bulk_revert.rb | 2 +- app/models/tag.rb | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/logical/bulk_revert.rb b/app/logical/bulk_revert.rb index 632474277..7492662ba 100644 --- a/app/logical/bulk_revert.rb +++ b/app/logical/bulk_revert.rb @@ -7,7 +7,7 @@ class BulkRevert def process(constraints) @constraints = constraints - ModAction.log("#{CurrentUser.name} processed bulk revert for #{constraints.inspect}") + ModAction.log("Processed bulk revert for #{constraints.inspect}") find_post_versions.order("updated_at, id").each do |version| version.undo! diff --git a/app/models/tag.rb b/app/models/tag.rb index 7d0b0ddb0..ba0fc7586 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -141,9 +141,12 @@ class Tag < ApplicationRecord Post.with_timeout(30_000, nil, {:tags => name}) do Post.raw_tag_match(name).where("true /* Tag#update_category_post_counts */").find_each do |post| post.reload - post.set_tag_counts(false) - args = TagCategory.categories.map {|x| ["tag_count_#{x}",post.send("tag_count_#{x}")]}.to_h.update(:tag_count => post.tag_count) - Post.where(:id => post.id).update_all(args) + # sometimes a post gets expunged + if post + post.set_tag_counts(false) + args = TagCategory.categories.map {|x| ["tag_count_#{x}",post.send("tag_count_#{x}")]}.to_h.update(:tag_count => post.tag_count) + Post.where(:id => post.id).update_all(args) + end end end end