From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 25 May 2022 22:20:30 +0000 (+0200)
Subject: Fix unnecessary query on status creation (#17901)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=773103cb58544e039696a666c28a23242c475b61;p=mastodon.git

Fix unnecessary query on status creation (#17901)
---

diff --git a/app/models/status.rb b/app/models/status.rb
index 21a574a71..3efa23ae2 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -511,7 +511,7 @@ class Status < ApplicationRecord
   end
 
   def set_poll_id
-    update_column(:poll_id, poll.id) unless poll.nil?
+    update_column(:poll_id, poll.id) if association(:poll).loaded? && poll.present?
   end
 
   def set_visibility