diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-26 17:33:26 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-26 17:33:26 +0100 |
| commit | 0c46bd11aa3dd5613ba49dfeed6971dc92587956 (patch) | |
| tree | 90673a51b23e1d7755f07cf0c32ac5fb88e83103 /app/validators | |
| parent | 6f6abc369f113b174fe191cf562098fe01c2eeec (diff) | |
| download | mastodon-0c46bd11aa3dd5613ba49dfeed6971dc92587956.tar mastodon-0c46bd11aa3dd5613ba49dfeed6971dc92587956.tar.gz mastodon-0c46bd11aa3dd5613ba49dfeed6971dc92587956.tar.bz2 mastodon-0c46bd11aa3dd5613ba49dfeed6971dc92587956.zip | |
Fix HTML validation (#10354)
* Fix HTML validation
* Report first HTML error instead on validation error
Diffstat (limited to 'app/validators')
| -rw-r--r-- | app/validators/html_validator.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/validators/html_validator.rb b/app/validators/html_validator.rb index 882c35d41..b7caee5a9 100644 --- a/app/validators/html_validator.rb +++ b/app/validators/html_validator.rb @@ -3,12 +3,16 @@ class HtmlValidator < ActiveModel::EachValidator def validate_each(record, attribute, value) return if value.blank? - record.errors.add(attribute, I18n.t('html_validator.invalid_markup')) unless valid_html?(value) + errors = html_errors(value) + unless errors.empty? + record.errors.add(attribute, I18n.t('html_validator.invalid_markup', error: errors.first.to_s)) + end end private - def valid_html?(str) - Nokogiri::HTML.fragment(str).to_s == str + def html_errors(str) + fragment = Nokogiri::HTML.fragment(str) + fragment.errors end end |