Permalink
Browse files

Fix typo in 0206259. Thanks @dolzenko

  • Loading branch information...
1 parent deeb0ed commit 9f3892808a9472f35435e221a9b55c6353832e9e @sikachu sikachu committed Aug 12, 2011
Showing with 2 additions and 2 deletions.
  1. +2 −2 lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
@@ -41,15 +41,15 @@ def matches? subject
def failure_message
"".tap do |str|
str << "Content types #{@allowed_types.join(", ")} should be accepted" if @allowed_types.present?
- str << "\n" if @allowed_types.present && @rejected_types.present?
+ str << "\n" if @allowed_types.present? && @rejected_types.present?
str << "Content types #{@rejected_types.join(", ")} should be rejected by #{@attachment_name}" if @rejected_types.present?
end
end
def negative_failure_message
"".tap do |str|
str << "Content types #{@allowed_types.join(", ")} should be rejected" if @allowed_types.present?
- str << "\n" if @allowed_types.present && @rejected_types.present?
+ str << "\n" if @allowed_types.present? && @rejected_types.present?
str << "Content types #{@rejected_types.join(", ")} should be accepted by #{@attachment_name}" if @rejected_types.present?
end
end

1 comment on commit 9f38928

britto commented on 9f38928 Nov 22, 2011

Can we have this fix backported to 2.3.x?

Please sign in to comment.