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

Escape-on-output: Cleanup addCampaignToSearch, remove isset #22035

Merged
merged 1 commit into from
Nov 19, 2021

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Cleanup addCampaignToSearch

Before

The functionality to add a campaign filter to a search and to add a campaign field to a component form are in the same tpl but the code run is mutually exclusive. Lots of complexity used to maintain this

After

Separate tpls, less variable assignments needed as a result and we can ditch the isset that upsets escape-on-output

Technical Details

Comments

@civibot
Copy link

civibot bot commented Nov 10, 2021

(Standard links)

@civibot civibot bot added the master label Nov 10, 2021
@eileenmcnaughton eileenmcnaughton changed the title Cleanup addCampaignToSearch Escape-on-output: Cleanup addCampaignToSearch Nov 11, 2021
@eileenmcnaughton eileenmcnaughton changed the title Escape-on-output: Cleanup addCampaignToSearch Escape-on-output: Cleanup addCampaignToSearch, remove isset Nov 13, 2021
@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 @colemanw @demeritcowboy any chance I can get this pushed through?

@demeritcowboy
Copy link
Contributor

I can take a look.
Jenkins retest this please.

@eileenmcnaughton
Copy link
Contributor Author

thanks @demeritcowboy

@seamuslee001 seamuslee001 merged commit 0c3509e into civicrm:master Nov 19, 2021
@seamuslee001 seamuslee001 deleted the campaign branch November 19, 2021 01:25
@eileenmcnaughton
Copy link
Contributor Author

thanks @seamuslee001 @demeritcowboy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants