Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Check failure on line 2 in projects/plugins/jetpack/changelog/fix-sharing-buttons-block-theme-toggle

View workflow job for this annotation

GitHub Actions / Changelogger validity

Type must be "major", "enhancement", "compat", "bugfix", or "other".

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could you create the changelog entry again? This is incorrect.

Error: Type must be "major", "enhancement", "compat", "bugfix", or "other".

I would recommend using the built-in CLI tool to generate those entries, to avoid such issues.

Suggested change
Type: fixed
Type: bugfix


Sharing: ensure legacy sharing settings remain accessible on block themes so users can disable sharing buttons appended to content.
8 changes: 6 additions & 2 deletions projects/plugins/jetpack/modules/sharedaddy/sharing.php
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,13 @@ public function management_page() {
$is_simple_site = defined( 'IS_WPCOM' ) && IS_WPCOM;
$show_block_message = $this->should_use_site_editor() && ! $is_simple_site;

// We either show old services config or the sharing block message.
// Show the block theme message (if applicable) and always show
// the services config so users can manage/disable legacy sharing.
if ( current_user_can( 'manage_options' ) ) :
$show_block_message ? $this->sharing_block_display() : $this->services_config_display();
if ( $show_block_message ) :
$this->sharing_block_display();
endif;
$this->services_config_display();
endif;
?>
</div>
Expand Down
Loading