From: ThibG <thib@sitedethib.com>
Date: Sun, 1 Dec 2019 16:24:33 +0000 (+0100)
Subject: Only normalize local polls (#12515)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f60cd97638c9de9cbc4714cfbc87a321324fe9ff;p=mastodon.git

Only normalize local polls (#12515)

Before this patch, if remote poll options have leading or trailing spaces,
the information stored locally won't match them, causing federated voting to
fail.
---

diff --git a/app/models/poll.rb b/app/models/poll.rb
index 5427368fd..b5deafcc2 100644
--- a/app/models/poll.rb
+++ b/app/models/poll.rb
@@ -36,7 +36,7 @@ class Poll < ApplicationRecord
   scope :attached, -> { where.not(status_id: nil) }
   scope :unattached, -> { where(status_id: nil) }
 
-  before_validation :prepare_options
+  before_validation :prepare_options, if: :local?
   before_validation :prepare_votes_count
 
   after_initialize :prepare_cached_tallies