Do not strip tags from Setting.site_short_description
#23975
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gargron
approved these changes
Mar 5, 2023
ClearlyClaire
approved these changes
Mar 6, 2023
Comment on lines
3
to
9
| = image_tag @instance_presenter.thumbnail&.file&.url(:'@1x') || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.title | ||
|
|
||
| .hero-widget__text | ||
| %p= @instance_presenter.description.html_safe.presence || t('about.about_mastodon_html') | ||
| %p= @instance_presenter.description.presence || t('about.about_mastodon_html') | ||
|
|
||
| - if Setting.trends && !(user_signed_in? && !current_user.setting_trends) | ||
| - trends = Trends.tags.query.allowed.limit(3) |
There was a problem hiding this comment.
Is that file still being used for anything?
ClearlyClaire
pushed a commit
that referenced
this pull request
Mar 14, 2023
ClearlyClaire
pushed a commit
to ClearlyClaire/mastodon
that referenced
this pull request
Mar 14, 2023
rutvijmehta-harness
pushed a commit
to rutvijmehta-harness/mastodon
that referenced
this pull request
Mar 19, 2023
rutvijmehta-harness
added a commit
to rutvijmehta-harness/mastodon
that referenced
this pull request
Mar 19, 2023
…) (#18) Co-authored-by: Christian Schmidt <github@chsc.dk>
arachnist
pushed a commit
to arachnist/mastodon
that referenced
this pull request
Apr 4, 2023
Roboron3042
pushed a commit
to Roboron3042/mastodon
that referenced
this pull request
Apr 16, 2023
skerit
pushed a commit
to 11ways/mastodon
that referenced
this pull request
Jul 7, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Setting.site_short_descriptionis plain text and should not be passed throughstrip_tags.In addition to stripping HTML tags,
strip_tagsalso escapes unescaped characters, sostrip_tags('gin & <i>tonic</i>')returnsgin & tonic.Steps to reproduce
You & I ❤️ <html>in the Server description field and then save.You & I ❤️ <html>in the left sidebar.Expected result
HTML source should contain this:
i.e. the human-readable description is
You & I ❤️ <html>, exactly as entered.Actual result
HTML source contains this:
i.e. the human-readable description is
You & I ❤️.