fixes #2384

2015-05-21 12:29:08 -07:00
parent 56c4f18826
commit 82fb3bd109
1 changed files with 5 additions and 0 deletions
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -192,6 +192,11 @@ class Tag < ActiveRecord::Base
        if category
          category_id = categories.value_for(category)

+          # in case a category change hasn't propagated to this server yet,
+          # force an update the local cache. This may get overwritten in the
+          # next few lines if the category is changed.
+          tag.update_category_cache
+
          if category_id != tag.category && !tag.is_locked? && (CurrentUser.is_builder? || tag.post_count <= 50)
            tag.update_column(:category, category_id)
            tag.update_category_cache_for_all