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

Hotfix custom sql filter inserttags #1490

Merged

Conversation

Ainschy
Copy link
Contributor

@Ainschy Ainschy commented Jan 24, 2023

Description

fixes the problem with strung together and nested inserttags

this should fix #880 (comment)

Checklist

  • Read and understood the CONTRIBUTING guidelines
  • Created tests, if possible
  • All tests passing
  • Extended the README / documentation, if necessary
  • Added myself to the @authors in touched PHP files
  • Checked the changes with phpcq and introduced no new issues

@zonky2 zonky2 added this to the 2.2.7 milestone Jan 24, 2023
@zonky2 zonky2 added the bug A bug! A bug! Fast, squish it! label Jan 24, 2023
@zonky2 zonky2 mentioned this pull request Jan 24, 2023
6 tasks
@zonky2
Copy link
Contributor

zonky2 commented Jan 24, 2023

@discordier workss fine for #880 (comment) a) and workaround)

Copy link
Member

@discordier discordier left a comment

Choose a reason for hiding this comment

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

Please change the methods to private

*
* @return string
*
* @internal Only to be used via parseRequestVars().
*/
public function convertParameter($arrMatch)
public function convertParameter($strMatch)
Copy link
Member

Choose a reason for hiding this comment

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

Can be made private now and the @internal can be removed. This method is now being called from $this->checkTag().

*
* @return string
*
* @internal Only to be used internal as callback from parseSecureInsertTags().
*/
public function parseAndAddSecureInsertTagAsParameter($arrMatch)
public function parseAndAddSecureInsertTagAsParameter($strMatch)
Copy link
Member

Choose a reason for hiding this comment

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

Can be made private now and the @internal can be removed. This method is now being called from $this->checkTag().

@stefanheimes stefanheimes merged commit 1d8d1a3 into MetaModels:master Jan 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug A bug! A bug! Fast, squish it!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

eig. SQL: default-Parameter mit MySQL-Funktion oder Contao-Inserttag
4 participants