Real-time collaboration: Fix comment syncing on site editor by alecgeatches · Pull Request #75746 · WordPress/gutenberg

alecgeatches · 2026-02-19T19:41:25Z

What?

When comments are a part of the post template, the site editor will show a "Disconnected" dialog when real-time collaboration is enabled:

This can be replicated by:

Disable RTC via WordPress Admin -> Settings -> Writing, and uncheck the "Enable real-time collaboration" checkbox. Click the "Save Changes" button.
Go to WordPress Admin -> Appearance -> Editor.
Edit the post template to include comments and then click "Save":

Screen.Recording.2026-02-19.at.12.09.45.PM.mov
Re-enable RTC.
Go back to the appearance editor and wait a bit.
See the "Disconnected" dialog above.

Why?

When comments are present on the site editor page, we request entity rooms for individual comments loaded on the page, like root/comment:1, root/comment:2, etc. Due to the fact that these have specified object IDs, this part of the code returns false and returns a 401 to the user, triggering the dialog.

How?

The fix here adds a special case for comments with specified IDs and does a special check against the comment. This isn't particularly robust for other special cases we may run into, but it does allow subscriptions to individual comment rooms.

Another possible fix would be to exclude comments and pre-filter them from subscribing in the first place, but this seemed like a fix in-line with other special case handlers in can_user_sync_entity_type(). @chriszarate, please let me know if this is the wrong place for this fix.

Testing Instructions

Check out this PR.
Ensure RTC is enabled via WordPress Admin -> Settings -> Writing, and uncheck the "Enable real-time collaboration" checkbox. Click the "Save Changes" button.
Go to WordPress Admin -> Appearance -> Editor.
Edit the post template to include comments and then click "Save":

Screen.Recording.2026-02-19.at.12.09.45.PM.mov
Refresh.
Ensure no "Disconnected" dialog shows.

…isconnect when comments are present

github-actions · 2026-02-19T19:41:36Z

The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the props-bot label.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: alecgeatches <alecgeatches@git.wordpress.org>
Co-authored-by: chriszarate <czarate@git.wordpress.org>
Co-authored-by: pkevan <paulkevan@git.wordpress.org>

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

lib/compat/wordpress-7.0/class-wp-http-polling-sync-server.php

github-actions · 2026-02-20T10:02:37Z

There was a conflict while trying to cherry-pick the commit to the wp/7.0 branch. Please resolve the conflict manually and create a PR to the wp/7.0 branch.

PRs to wp/7.0 are similar to PRs to trunk, but you should base your PR on the wp/7.0 branch instead of trunk.

# Checkout the wp/7.0 branch instead of trunk.
git checkout wp/7.0

# Create a new branch for your PR.
git checkout -b my-branch

# Cherry-pick the commit.
git cherry-pick 5409d4b8ec28ef5f943fc3c10d3a8c812cbd3af5

# Check which files have conflicts.
git status

# Resolve the conflict...
# Add the resolved files to the staging area.
git status
git add .
git cherry-pick --continue

# Push the branch to the repository
git push origin my-branch

# Create a PR and set the base to the wp/7.0 branch.
# See https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-base-branch-of-a-pull-request.

* Add special case for root comment entities to stop site editor auto-disconnect when comments are present * Use int casting instead of absint * Add PR to changelog --------- Co-authored-by: alecgeatches <alecgeatches@git.wordpress.org> Co-authored-by: chriszarate <czarate@git.wordpress.org>

Developed in #10981. See also WordPress/gutenberg#75746. Props alecgeatches, czarate. See #64622. git-svn-id: https://develop.svn.wordpress.org/trunk@61704 602fd350-edb4-49c9-b593-d223f7449a82

Developed in WordPress/wordpress-develop#10981. See also WordPress/gutenberg#75746. Props alecgeatches, czarate. See #64622. Built from https://develop.svn.wordpress.org/trunk@61704 git-svn-id: http://core.svn.wordpress.org/trunk@61012 1a063a9b-81f0-0310-95a4-ce76da25c4cd

* Add special case for root comment entities to stop site editor auto-disconnect when comments are present * Use int casting instead of absint * Add PR to changelog --------- Co-authored-by: alecgeatches <alecgeatches@git.wordpress.org> Co-authored-by: chriszarate <czarate@git.wordpress.org>

ockham · 2026-02-23T09:40:16Z

I just cherry-picked this PR to the release/22.6 branch to get it included in the next release: 5ce791b

* Add special case for root comment entities to stop site editor auto-disconnect when comments are present * Use int casting instead of absint * Add PR to changelog --------- Co-authored-by: alecgeatches <alecgeatches@git.wordpress.org> Co-authored-by: chriszarate <czarate@git.wordpress.org>

t-hamano · 2026-02-25T10:00:33Z

This PR is for the Gutenberg plugin, and a backport to wp/7.0 will not be necessary.

ellatrix · 2026-03-03T15:04:59Z

It's still good practice to backport everything so successive PRs don't have cherry-pick conflicts

* Add special case for root comment entities to stop site editor auto-disconnect when comments are present * Use int casting instead of absint * Add PR to changelog --------- Co-authored-by: alecgeatches <alecgeatches@git.wordpress.org> Co-authored-by: chriszarate <czarate@git.wordpress.org>

github-actions · 2026-03-03T15:14:36Z

I just cherry-picked this PR to the wp/7.0 branch to get it included in the next release: 594eb3f

ellatrix · 2026-03-04T17:34:55Z

backport-changelog/7.0/10894.md

 * https://github.com/WordPress/gutenberg/pull/75681
 * https://github.com/WordPress/gutenberg/pull/75682
 * https://github.com/WordPress/gutenberg/pull/75708
+* https://github.com/WordPress/gutenberg/pull/75746


We shouldn't add links to closed core PRs, a new file should be created in this case

…ackport PR

…ackport PR (#76154) Co-authored-by: alecgeatches <alecgeatches@git.wordpress.org> Co-authored-by: ellatrix <ellatrix@git.wordpress.org>

CI run: WordPress#11167. See #64595. --- I've included a log of the Gutenberg changes with the following command: git log --reverse --format="- %s" 022d8dd3d461f91b15c1f0410649d3ebb027207f..e499abfb843a43ac88455ca319220c5f181e1cf3 | sed 's|#\([0-9][0-9]*\)|https://github.com/WordPress/gutenberg/pull/\1|g; /github\.com\/WordPress\/gutenberg\/pull/!d' | pbcopy - Add documentation for contentRole and listView block supports (WordPress/gutenberg#75903) - Interactivity Router: fix back and forward navigation after refresh (WordPress/gutenberg#75927) - Real-time collaboration: Fix disconnect dialog on navigate (WordPress/gutenberg#75886) - Real Time Collab: Throttle syncing for inactive tabs. (WordPress/gutenberg#75843) - Components: Specify line-height to avoid inheriting default values (WordPress/gutenberg#75880) - Pattern Editing: Fix sibling blocks to edited pattern not being disabled (WordPress/gutenberg#75994) - Sync connector PHP behavior with Core backport changes (WordPress/gutenberg#75968) - Connectors: Avoid manual string concatenation (WordPress/gutenberg#75997) - DataForm: fix field label for panel (should not be uppercase) (WordPress/gutenberg#75944) - Views: add support for more overrides (all developer-defined config) (WordPress/gutenberg#75971) - Use homeUrl instead of siteUrl for link badge evaluations (WordPress/gutenberg#75978) - DataViews: Right-align `integer` and `number` fields (WordPress/gutenberg#75917) - Navigation Link: Compare internal links by host instead of origin (WordPress/gutenberg#76015) - Fix: Skip scaled image sideload for images below big image threshold (WordPress/gutenberg#75990) - Client side media cherry pick for 7.0 (WordPress/gutenberg#75998) - Show transform dropdown previews on focus as well as hover (WordPress/gutenberg#75940) (WordPress/gutenberg#75992) - RTC: Fix syncing of emoji / surrogate pairs (WordPress/gutenberg#76049) - [Real-time Collaboration] Fix sync issue on refresh (WordPress/gutenberg#76017) - Real-time collaboration: Improve disconnect dialog (WordPress/gutenberg#75970) - DataViews: Fix filter toggle flickering when there are locked or primary filters (WordPress/gutenberg#75913) (WordPress/gutenberg#76068) - Connectors: Dynamically register providers from WP AI Client registry (WordPress/gutenberg#76014) - PHP-only Blocks: Reflect bound attribute values in inspector controls (WordPress/gutenberg#76040) - Fix: Set quality and strip metadata in client-side image resize (WordPress/gutenberg#76029) - RTC: Prevent duplicate poll cycles (WordPress/gutenberg#76059) - RTC: Fix stale CRDT document persisted on save (WordPress/gutenberg#75975) - RTC: Disable multiple collaborators if meta boxes are present (WordPress/gutenberg#75939) - Directly inject styles in overlay to make styles stay consistently mounted (WordPress/gutenberg#75700) - Real-time collaboration: Fix comment syncing on site editor (WordPress/gutenberg#75746) - Real-time Collaboration: Bug fix for CRDT user selection and add tests (WordPress/gutenberg#75075) - RTC: Updates from backport PR (WordPress/gutenberg#75711) - RTC: Fix undefined array_first() call in sync storage (WordPress/gutenberg#75869) - RTC: Fix fallthrough for sync update switch statement (WordPress/gutenberg#76060) - Real-time collaboration: Remove block client IDs from Awareness, fix "Show Template" view (WordPress/gutenberg#75590) - RTC: Add session activity notifications (WordPress/gutenberg#76065) - Prevent non-reproducible Sass/CSS builds. (WordPress/gutenberg#76098) - Block toolbar and context menu: hide pattern actions in Revisions UI (WordPress/gutenberg#76066) - Try enabling style variation transforms for blocks in contentOnly mode (WordPress/gutenberg#75761) - Block toolbar: hide styles dropdown in Revisions UI (WordPress/gutenberg#76119) - Image block: fix lightbox srcset size (WordPress/gutenberg#76092) - Fix writing flow navigation for annotation style, or any other block with border radius (WordPress/gutenberg#76072) - Image: Hide 'Set as featured image' for in-editor revisions (WordPress/gutenberg#76123) - Connectors: Gate unavailable install actions behind install capability (WordPress/gutenberg#75980) - build: Exclude experimental pages from Core builds (WordPress/gutenberg#76038) - HTML & Shortcode: Disable viewport visibility support (WordPress/gutenberg#76138) - RTC: Verify client ID to avoid awareness mutation (WordPress/gutenberg#76056) - wp-build: Do not remove Core's default script modules registration (WordPress/gutenberg#75705) - wp-build: Deregister script modules before re-registering (WordPress/gutenberg#75909) - Remove `! function_exists()` checks from PHP templates (WordPress/gutenberg#76062) - Connectors: Update page identifier to options-connectors (WordPress/gutenberg#76156) - Connectors: Align init hook priorities with Core overrides (WordPress/gutenberg#76161) - Icon Block: Clean up selectors config (WordPress/gutenberg#75786) - Icons: Fix incorrect icon slug (WordPress/gutenberg#76165) - RTC: Enable RTC by default (WordPress/gutenberg#75739) - Rename and visibility modals: gate shortcuts behind canEditBlock to prevent triggering in revisions UI (WordPress/gutenberg#76168) - Fix: Block style variations not rendering in Site Editor Patterns page (WordPress/gutenberg#76122) - Client-side media processing: only use media upload provider when not in preview mode (WordPress/gutenberg#76124) - Notes: Disable for in-editor revisions (WordPress/gutenberg#76180) - Core Data: Support reading revision data in useEntityProp (fixes footnotes in revisions UI) (WordPress/gutenberg#76106) - Client-side media processing: Try plumbing invalidation to the block-editor's mediaUpload onSuccess callback (WordPress/gutenberg#76173) - Connectors: Improve responsive layout on small screens (WordPress/gutenberg#76186) - Interactivity API: Fix router initialization race condition on Safari/Firefox (WordPress/gutenberg#76053) (WordPress/gutenberg#76191) - Interactivity: Fix crypto.randomUUID crash in non-secure contexts (WordPress/gutenberg#76151) git-svn-id: https://develop.svn.wordpress.org/trunk@61843 602fd350-edb4-49c9-b593-d223f7449a82

CI run: WordPress/wordpress-develop#11167. See #64595. --- I've included a log of the Gutenberg changes with the following command: git log --reverse --format="- %s" 022d8dd3d461f91b15c1f0410649d3ebb027207f..e499abfb843a43ac88455ca319220c5f181e1cf3 | sed 's|#\([0-9][0-9]*\)|https://github.com/WordPress/gutenberg/pull/\1|g; /github\.com\/WordPress\/gutenberg\/pull/!d' | pbcopy - Add documentation for contentRole and listView block supports (WordPress/gutenberg#75903) - Interactivity Router: fix back and forward navigation after refresh (WordPress/gutenberg#75927) - Real-time collaboration: Fix disconnect dialog on navigate (WordPress/gutenberg#75886) - Real Time Collab: Throttle syncing for inactive tabs. (WordPress/gutenberg#75843) - Components: Specify line-height to avoid inheriting default values (WordPress/gutenberg#75880) - Pattern Editing: Fix sibling blocks to edited pattern not being disabled (WordPress/gutenberg#75994) - Sync connector PHP behavior with Core backport changes (WordPress/gutenberg#75968) - Connectors: Avoid manual string concatenation (WordPress/gutenberg#75997) - DataForm: fix field label for panel (should not be uppercase) (WordPress/gutenberg#75944) - Views: add support for more overrides (all developer-defined config) (WordPress/gutenberg#75971) - Use homeUrl instead of siteUrl for link badge evaluations (WordPress/gutenberg#75978) - DataViews: Right-align `integer` and `number` fields (WordPress/gutenberg#75917) - Navigation Link: Compare internal links by host instead of origin (WordPress/gutenberg#76015) - Fix: Skip scaled image sideload for images below big image threshold (WordPress/gutenberg#75990) - Client side media cherry pick for 7.0 (WordPress/gutenberg#75998) - Show transform dropdown previews on focus as well as hover (WordPress/gutenberg#75940) (WordPress/gutenberg#75992) - RTC: Fix syncing of emoji / surrogate pairs (WordPress/gutenberg#76049) - [Real-time Collaboration] Fix sync issue on refresh (WordPress/gutenberg#76017) - Real-time collaboration: Improve disconnect dialog (WordPress/gutenberg#75970) - DataViews: Fix filter toggle flickering when there are locked or primary filters (WordPress/gutenberg#75913) (WordPress/gutenberg#76068) - Connectors: Dynamically register providers from WP AI Client registry (WordPress/gutenberg#76014) - PHP-only Blocks: Reflect bound attribute values in inspector controls (WordPress/gutenberg#76040) - Fix: Set quality and strip metadata in client-side image resize (WordPress/gutenberg#76029) - RTC: Prevent duplicate poll cycles (WordPress/gutenberg#76059) - RTC: Fix stale CRDT document persisted on save (WordPress/gutenberg#75975) - RTC: Disable multiple collaborators if meta boxes are present (WordPress/gutenberg#75939) - Directly inject styles in overlay to make styles stay consistently mounted (WordPress/gutenberg#75700) - Real-time collaboration: Fix comment syncing on site editor (WordPress/gutenberg#75746) - Real-time Collaboration: Bug fix for CRDT user selection and add tests (WordPress/gutenberg#75075) - RTC: Updates from backport PR (WordPress/gutenberg#75711) - RTC: Fix undefined array_first() call in sync storage (WordPress/gutenberg#75869) - RTC: Fix fallthrough for sync update switch statement (WordPress/gutenberg#76060) - Real-time collaboration: Remove block client IDs from Awareness, fix "Show Template" view (WordPress/gutenberg#75590) - RTC: Add session activity notifications (WordPress/gutenberg#76065) - Prevent non-reproducible Sass/CSS builds. (WordPress/gutenberg#76098) - Block toolbar and context menu: hide pattern actions in Revisions UI (WordPress/gutenberg#76066) - Try enabling style variation transforms for blocks in contentOnly mode (WordPress/gutenberg#75761) - Block toolbar: hide styles dropdown in Revisions UI (WordPress/gutenberg#76119) - Image block: fix lightbox srcset size (WordPress/gutenberg#76092) - Fix writing flow navigation for annotation style, or any other block with border radius (WordPress/gutenberg#76072) - Image: Hide 'Set as featured image' for in-editor revisions (WordPress/gutenberg#76123) - Connectors: Gate unavailable install actions behind install capability (WordPress/gutenberg#75980) - build: Exclude experimental pages from Core builds (WordPress/gutenberg#76038) - HTML & Shortcode: Disable viewport visibility support (WordPress/gutenberg#76138) - RTC: Verify client ID to avoid awareness mutation (WordPress/gutenberg#76056) - wp-build: Do not remove Core's default script modules registration (WordPress/gutenberg#75705) - wp-build: Deregister script modules before re-registering (WordPress/gutenberg#75909) - Remove `! function_exists()` checks from PHP templates (WordPress/gutenberg#76062) - Connectors: Update page identifier to options-connectors (WordPress/gutenberg#76156) - Connectors: Align init hook priorities with Core overrides (WordPress/gutenberg#76161) - Icon Block: Clean up selectors config (WordPress/gutenberg#75786) - Icons: Fix incorrect icon slug (WordPress/gutenberg#76165) - RTC: Enable RTC by default (WordPress/gutenberg#75739) - Rename and visibility modals: gate shortcuts behind canEditBlock to prevent triggering in revisions UI (WordPress/gutenberg#76168) - Fix: Block style variations not rendering in Site Editor Patterns page (WordPress/gutenberg#76122) - Client-side media processing: only use media upload provider when not in preview mode (WordPress/gutenberg#76124) - Notes: Disable for in-editor revisions (WordPress/gutenberg#76180) - Core Data: Support reading revision data in useEntityProp (fixes footnotes in revisions UI) (WordPress/gutenberg#76106) - Client-side media processing: Try plumbing invalidation to the block-editor's mediaUpload onSuccess callback (WordPress/gutenberg#76173) - Connectors: Improve responsive layout on small screens (WordPress/gutenberg#76186) - Interactivity API: Fix router initialization race condition on Safari/Firefox (WordPress/gutenberg#76053) (WordPress/gutenberg#76191) - Interactivity: Fix crypto.randomUUID crash in non-secure contexts (WordPress/gutenberg#76151) Built from https://develop.svn.wordpress.org/trunk@61843 git-svn-id: http://core.svn.wordpress.org/trunk@61130 1a063a9b-81f0-0310-95a4-ce76da25c4cd

Add special case for root comment entities to stop site editor auto-d…

ddf6fde

…isconnect when comments are present

alecgeatches requested a review from spacedmonkey as a code owner February 19, 2026 19:41

alecgeatches requested review from chriszarate and removed request for spacedmonkey February 19, 2026 19:41

alecgeatches self-assigned this Feb 19, 2026

alecgeatches added [Feature] Real-time Collaboration Phase 3 of the Gutenberg roadmap around real-time collaboration [Type] Bug An existing feature does not function as intended labels Feb 19, 2026

chriszarate added the Backport to WP 7.0 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta label Feb 19, 2026

chriszarate reviewed Feb 19, 2026

View reviewed changes

lib/compat/wordpress-7.0/class-wp-http-polling-sync-server.php Outdated Show resolved Hide resolved

Use int casting instead of absint

73afd06

chriszarate approved these changes Feb 19, 2026

View reviewed changes

Add PR to changelog

cd152d2

chriszarate enabled auto-merge (squash) February 19, 2026 20:07

alecgeatches mentioned this pull request Feb 19, 2026

Real-time collaboration: Fix comment syncing on site editor WordPress/wordpress-develop#10981

Closed

ellatrix added the Backport to Gutenberg RC Pull request that needs to be backported to a Gutenberg release candidate (RC) label Feb 19, 2026

Merge branch 'WordPress:trunk' into fix/rtc-site-editor-comment-room

5d6b752

chriszarate merged commit 5409d4b into WordPress:trunk Feb 20, 2026
38 checks passed

chriszarate deleted the fix/rtc-site-editor-comment-room branch February 20, 2026 10:00

github-actions bot mentioned this pull request Feb 20, 2026

PHP backports for WP 7.0 #74043

Open

github-actions bot added this to the Gutenberg 22.7 milestone Feb 20, 2026

ellatrix added Backport to WP 7.0 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta and removed Backport to WP 7.0 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta labels Feb 20, 2026

ellatrix mentioned this pull request Feb 20, 2026

Workflows: Use pull_request_target for cherry-pick workflow #75775

Merged

3 tasks

ellatrix added Backport to WP 7.0 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta and removed Backport to WP 7.0 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta labels Feb 20, 2026

ellatrix mentioned this pull request Feb 20, 2026

Real-time collaboration: Fix comment syncing on site editor (#75746) #75776

Closed

ockham modified the milestones: Gutenberg 22.7, Gutenberg 22.6 Feb 23, 2026

ockham removed the Backport to Gutenberg RC Pull request that needs to be backported to a Gutenberg release candidate (RC) label Feb 23, 2026

t-hamano removed the Backport to WP 7.0 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta label Feb 25, 2026

maxschmeling mentioned this pull request Mar 2, 2026

Collaborative Editing iteration for WordPress 7.0 #74549

Open

chriszarate added the Backport to WP 7.0 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta label Mar 3, 2026

github-actions bot added Backported to WP Core Pull request that has been successfully merged into WP Core and removed Backport to WP 7.0 Beta/RC Pull request that needs to be backported to the WordPress major release that's currently in beta labels Mar 3, 2026

ellatrix reviewed Mar 4, 2026

View reviewed changes

alecgeatches added a commit that referenced this pull request Mar 4, 2026

Move backport changelog PR for Gutenberg #75746 to correct matching b…

5e7737d

…ackport PR

alecgeatches mentioned this pull request Mar 4, 2026

Fix backport changelog PR for Gutenberg #75746 #76154

Merged

alecgeatches added a commit that referenced this pull request Mar 4, 2026

Move backport changelog PR for Gutenberg #75746 to correct matching b…

70083fc

…ackport PR (#76154) Co-authored-by: alecgeatches <alecgeatches@git.wordpress.org> Co-authored-by: ellatrix <ellatrix@git.wordpress.org>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Real-time collaboration: Fix comment syncing on site editor#75746

Real-time collaboration: Fix comment syncing on site editor#75746
chriszarate merged 4 commits intoWordPress:trunkfrom
Automattic:fix/rtc-site-editor-comment-room

alecgeatches commented Feb 19, 2026

Uh oh!

github-actions bot commented Feb 19, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

ockham commented Feb 23, 2026

Uh oh!

t-hamano commented Feb 25, 2026

Uh oh!

ellatrix commented Mar 3, 2026

Uh oh!

github-actions bot commented Mar 3, 2026

Uh oh!

ellatrix Mar 4, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

alecgeatches commented Feb 19, 2026

What?

Why?

How?

Testing Instructions

Uh oh!

github-actions bot commented Feb 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Feb 20, 2026

Uh oh!

ockham commented Feb 23, 2026

Uh oh!

t-hamano commented Feb 25, 2026

Uh oh!

ellatrix commented Mar 3, 2026

Uh oh!

github-actions bot commented Mar 3, 2026

Uh oh!

ellatrix Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

github-actions bot commented Feb 19, 2026 •

edited

Loading