diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-28 04:44:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-28 04:44:59 +0100 |
| commit | f1bc90ab508cbdebc646324f87db48a9e80036f4 (patch) | |
| tree | c9e6fff16d8e69ed99e7010cabd4d83d595e5493 /app/lib/formatter.rb | |
| parent | f46f67d984e4e2deb4bf98cd5c5de813caf66eca (diff) | |
Rename :poll to :preloadable_poll and :owned_poll to :poll on Status (#10401)
Also, fix some n+1 queries Resolve #10365
Diffstat (limited to 'app/lib/formatter.rb')
| -rw-r--r-- | app/lib/formatter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/lib/formatter.rb b/app/lib/formatter.rb index aadf03b2a..59dfc9004 100644 --- a/app/lib/formatter.rb +++ b/app/lib/formatter.rb @@ -19,8 +19,8 @@ class Formatter raw_content = status.text - if options[:inline_poll_options] && status.poll - raw_content = raw_content + "\n\n" + status.poll.options.map { |title| "[ ] #{title}" }.join("\n") + if options[:inline_poll_options] && status.preloadable_poll + raw_content = raw_content + "\n\n" + status.preloadable_poll.options.map { |title| "[ ] #{title}" }.join("\n") end return '' if raw_content.blank? |