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: Fix Query Loop with excerpt outputting invalid HTML #41333

Merged
merged 1 commit into from
Jan 28, 2025

Conversation

fushar
Copy link
Contributor

@fushar fushar commented Jan 27, 2025

Fixes Automattic/wp-calypso#98922

Proposed changes:

This PR "reverts" the logic added in WordPress/gutenberg#67272, purely from Dotcom side.

The above PR broke Query Loop block which contains excerpts. This is more visible when the posts have nontrivial blocks at the beginning, e.g. blockquote:

Before (with the bug) After (with this hotfix)
image image

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

  1. Create a post.
  2. Add some non-trivial blocks in the post such as blockquote.
  3. Publish the post.
  4. Create a page.
  5. Insert a Query Loop block, which includes post excerpt in the setting.
  6. Publish the page.
  7. View the page.
  8. Verify it contains broken HTML (see screenshot above).
  9. Patch this PR.
  10. Verify the page does not contain broken HTML anymore.

Copy link
Contributor

github-actions bot commented Jan 27, 2025

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the hotfix-query-loop-bug branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.
  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack-mu-wpcom-plugin hotfix-query-loop-bug
    

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

Copy link
Contributor

github-actions bot commented Jan 27, 2025

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • 🔴 Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • 🔴 Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Jan 27, 2025
@fushar fushar marked this pull request as ready for review January 27, 2025 15:03
@fushar fushar requested review from merkushin and ryelle January 27, 2025 15:03
@fushar fushar requested a review from ockham January 27, 2025 15:04
Copy link
Member

@merkushin merkushin left a comment

Choose a reason for hiding this comment

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

Works well 👍

@fushar fushar self-assigned this Jan 28, 2025
@fushar fushar merged commit a898ff9 into trunk Jan 28, 2025
63 of 64 checks passed
@fushar fushar deleted the hotfix-query-loop-bug branch January 28, 2025 03:59
@github-actions github-actions bot removed the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Jan 28, 2025
@jeherve jeherve added the [Type] Bug When a feature is broken and / or not performing as intended label Feb 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[mu wpcom Feature] Wpcom Hotfixes [Package] Jetpack mu wpcom WordPress.com Features [Type] Bug When a feature is broken and / or not performing as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Excerpt Block can display broken HTML if used in a page
3 participants