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

Added a fix for the notice not displaying when cloudflare and APO are enabled #5976

Merged
merged 5 commits into from Jun 19, 2023

Conversation

CrochetFeve0251
Copy link
Contributor

@CrochetFeve0251 CrochetFeve0251 commented Jun 14, 2023

Description

Fix an issue with the new Cloudflare update where a helper message is not displayed when APO is enabled.
For that a new filter has been added with the corresponding callbacks on Cloudflare and Sucury.

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)

How Has This Been Tested?

Locally

Checklist:

Please delete the options that are not relevant.

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

@CrochetFeve0251 CrochetFeve0251 self-assigned this Jun 14, 2023
@CrochetFeve0251 CrochetFeve0251 added type: bug Indicates an unexpected problem or unintended behavior module: cloudflare labels Jun 14, 2023
@CrochetFeve0251 CrochetFeve0251 requested a review from a team June 15, 2023 06:45
@Tabrisrp Tabrisrp marked this pull request as ready for review June 15, 2023 19:26
@vmanthos vmanthos self-requested a review June 16, 2023 06:16
@piotrbak piotrbak added this to the 3.14.1 milestone Jun 18, 2023
@vmanthos
Copy link
Contributor

The notice:

Cloudflare Add-on is currently enabled. Configuration of the CDN settings is not required for Cloudflare to work on your site.

is now displayed when:

  1. The official Cloudflare plugin is enabled/Cloudflare account activated - regardless of whether Cloudflare APO is enabled.
  2. The Cloudflare plugin is deactivated and our Cloudflare add-on is enabled - regardless of whether "Cache Everything" is enabled.

This matches what was happening with 3.13.4 as far as the enabled Cloudflare add-on goes.

Customers that are using Cloudflare even without APO or "Cache Everything" don't need to add anything to the CDN tab.
@piotrbak Should we cover cases where our add-on is disabled but Cloudflare is used on the site?

@piotrbak
Copy link
Contributor

@vmanthos What we have now is good from my perspective

Copy link
Contributor

@vmanthos vmanthos left a comment

Choose a reason for hiding this comment

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

Thank you @piotrbak! 🙏

Working as expected! 👍

@vmanthos vmanthos added this pull request to the merge queue Jun 19, 2023
Merged via the queue into develop with commit 2c55929 Jun 19, 2023
8 checks passed
@vmanthos vmanthos deleted the bug/cf-apo-fix-issue-with-notice branch June 19, 2023 13:44
@engahmeds3ed engahmeds3ed mentioned this pull request Jul 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
module: cloudflare type: bug Indicates an unexpected problem or unintended behavior
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants