Skip to content

Commit eb12d94

Browse files
ClearlyClaireGargron
authored andcommitted
Correctly make polls and media mutually exclusive (mastodon#10141)
1 parent fe050b9 commit eb12d94

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

app/services/post_status_service.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def postprocess_status!
9595
def validate_media!
9696
return if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable)
9797

98-
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll_id].present?
98+
raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present?
9999

100100
@media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i))
101101

0 commit comments

Comments
 (0)