Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#6193: IHtmlFilter and TokenFilter improvements and bugfixes #6938

Merged
merged 6 commits into from
Apr 19, 2024

Conversation

sfmskywalker
Copy link
Member

This changeset unifies the two separate TokenFilter implementations (one for BodyPart, TextField, etc and another one for certain elements such as Html).
It also fixes a bug with the TokenFilter when executing for HtmlWidget, where the wrong content item is being recorded by the handler (the original implementation).
Thirdly, it removes awkward code repetition by moving filter execution into a dedicated HtmlFilterRunner service.

Fixes #6193

This changeset unifies the two separate TokenFilter implementations (one for BodyPart, TextField, etc and another one for certain elements such as Html).
It also fixes a bug with the TokenFilter when executing for HtmlWidget, where the wrong content item is being recorded by the handler (the original implementation).
Thirdly, it removes awkward code repetition by moving filter execution into a dedicated HtmlFilterRunner service.
@sfmskywalker
Copy link
Member Author

This also includes @jtkech 's work on fixing an encoding issue and execution order of the TokenFilter.

using Orchard.Core.Feeds;
using Orchard.Tags.Services;
using Orchard.Localization;
using System.Web.Routing;
using Orchard.Environment.Extensions;

namespace Orchard.Tags.Feeds {
namespace Orchard.Tags.Feeds
{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is that ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in d95f812

@sebastienros
Copy link
Member

Minus the comments it looks good.

@jtkech
Copy link
Member

jtkech commented Oct 27, 2016

Does this one only waiting for a name and a curly brace rule correction?
And maybe better to target 1.10.x?

Best.

@BenedekFarkas BenedekFarkas changed the base branch from dev to 1.10.x April 9, 2024 08:24
@BenedekFarkas BenedekFarkas changed the base branch from 1.10.x to dev April 9, 2024 08:24
@BenedekFarkas
Copy link
Member

@sebastienros tested, good to go!

@BenedekFarkas BenedekFarkas changed the title IHtmlFilter and TokenFilter improvements and bugfixes #6193: IHtmlFilter and TokenFilter improvements and bugfixes Apr 18, 2024
@BenedekFarkas BenedekFarkas merged commit cf4335e into dev Apr 19, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ContentHandler TokenFilter and Element TokenFilter can't cohabit
6 participants