Skip to content

Connectors: Move from experimental to wordpress-7.0 compat #78228

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.

Sign up for GitHub

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

Merged
t-hamano merged 2 commits into from
May 16, 2026
Merged

Connectors: Move from experimental to wordpress-7.0 compat #78228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b06d891
Connectors: Consolidate WP 7.0 compat loading and move from experimental
t-hamano May 13, 2026
51fac9c
Merge branch 'trunk' into connectors/move-compat
t-hamano May 16, 2026
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
29 changes: 29 additions & 0 deletions lib/compat/wordpress-7.0/connectors.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,3 +206,32 @@ function _wp_connectors_resolve_ai_provider_logo_url( string $path ): ?string {
return null;
}
}

// Priority 11 to run after Core's menu.php sets up the connectors menu.
add_action( 'admin_menu', '_gutenberg_connectors_add_settings_menu_item', 11 );

/**
* Registers the Connectors menu item under Settings.
* Removes Core's connectors menu item first to prevent duplication.
*
* @access private
*/
function _gutenberg_connectors_add_settings_menu_item(): void {
if ( ! class_exists( '\WordPress\AiClient\AiClient' ) || ! function_exists( 'gutenberg_options_connectors_wp_admin_render_page' ) ) {
return;
}

// Remove Core's connectors menu item if it exists.
remove_submenu_page( 'options-general.php', 'connectors-wp-admin' );
remove_submenu_page( 'options-general.php', 'options-connectors.php' );

add_submenu_page(
'options-general.php',
__( 'Connectors', 'gutenberg' ),
__( 'Connectors', 'gutenberg' ),
'manage_options',
'options-connectors-wp-admin',
'gutenberg_options_connectors_wp_admin_render_page',
1
);
}
0 ...imental/connectors/default-connectors.php → ...mpat/wordpress-7.0/default-connectors.php
View file
Open in desktop
File renamed without changes.
37 changes: 0 additions & 37 deletions lib/experimental/connectors/load.php
View file
Open in desktop

This file was deleted.

11 changes: 6 additions & 5 deletions lib/load.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ function gutenberg_is_experiment_enabled( $name ) {
require __DIR__ . '/compat/wordpress-7.0/template-activate.php';
require __DIR__ . '/compat/wordpress-7.0/rest-api.php';
require __DIR__ . '/compat/wordpress-7.0/global-styles.php';
require __DIR__ . '/compat/wordpress-7.0/class-wp-connector-registry.php';
require __DIR__ . '/compat/wordpress-7.0/connectors.php';

// WordPress 7.1 compat.
require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-rest-view-config-controller-7-1.php';
Expand Down Expand Up @@ -123,6 +121,12 @@ function gutenberg_is_experiment_enabled( $name ) {
require __DIR__ . '/compat/wordpress-7.0/script-modules.php';
require __DIR__ . '/compat/wordpress-7.0/fonts.php';

if ( class_exists( '\WordPress\AiClient\AiClient' ) ) {
require __DIR__ . '/compat/wordpress-7.0/class-wp-connector-registry.php';
require __DIR__ . '/compat/wordpress-7.0/connectors.php';
require __DIR__ . '/compat/wordpress-7.0/default-connectors.php';
}

// WordPress 7.1 compat.
require __DIR__ . '/compat/wordpress-7.1/classic-block.php';

Expand All @@ -137,9 +141,6 @@ function gutenberg_is_experiment_enabled( $name ) {
if ( gutenberg_is_experiment_enabled( 'gutenberg-media-editor' ) ) {
require __DIR__ . '/experimental/media-editor/load.php';
}
if ( class_exists( '\WordPress\AiClient\AiClient' ) ) {
require __DIR__ . '/experimental/connectors/load.php';
}

if ( gutenberg_is_experiment_enabled( 'gutenberg-workflow-palette' ) ) {
require __DIR__ . '/experimental/workflow-palette.php';
Expand Down
Loading