| @@ -23,9 +23,9 @@ | ||
| 23 | 23 | // Define version constant for backwards compatibility. |
| 24 | 24 | // The constants.php file returns an array but doesn't define constants to avoid conflicts. |
| 25 | 25 | $constants_file = plugin_dir_path( __DIR__ ) . 'build/constants.php'; |
| 26 | 26 | if ( file_exists( $constants_file ) && ! defined( 'GUTENBERG_VERSION' ) ) { |
| 27 | - $build_constants = require $constants_file; | |
| 27 | + $build_constants = require_once $constants_file; | |
| 28 | 28 | define( 'GUTENBERG_VERSION', $build_constants['version'] ); |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
| @@ -37,8 +37,14 @@ | ||
| 37 | 37 | * |
| 38 | 38 | * @return bool True when the experiment is enabled. |
| 39 | 39 | */ |
| 40 | 40 | function gutenberg_is_experiment_enabled( $name ) { |
| 41 | + // Special handling for active_templates - check if the active_templates option exists. | |
| 42 | + // This is not stored in the experiments array but as a separate option. | |
| 43 | + if ( 'active_templates' === $name ) { | |
| 44 | + return is_array( get_option( 'active_templates' ) ); | |
| 45 | + } | |
| 46 | + | |
| 41 | 47 | $experiments = get_option( 'gutenberg-experiments' ); |
| 42 | 48 | return ! empty( $experiments[ $name ] ); |
| 43 | 49 | } |
| 44 | 50 | |
| @@ -48,49 +54,38 @@ | ||
| 48 | 54 | if ( ! class_exists( 'WP_REST_Block_Editor_Settings_Controller' ) ) { |
| 49 | 55 | require_once __DIR__ . '/experimental/class-wp-rest-block-editor-settings-controller.php'; |
| 50 | 56 | } |
| 51 | 57 | |
| 58 | + // WordPress 6.9 compat. | |
| 59 | + require __DIR__ . '/compat/wordpress-6.9/class-gutenberg-rest-attachments-controller-6-9.php'; | |
| 60 | + require __DIR__ . '/compat/wordpress-6.9/block-bindings.php'; | |
| 61 | + require __DIR__ . '/compat/wordpress-6.9/post-data-block-bindings.php'; | |
| 62 | + require __DIR__ . '/compat/wordpress-6.9/term-data-block-bindings.php'; | |
| 63 | + require __DIR__ . '/compat/wordpress-6.9/rest-api.php'; | |
| 64 | + require __DIR__ . '/compat/wordpress-6.9/block-comments.php'; | |
| 65 | + require __DIR__ . '/compat/wordpress-6.9/class-gutenberg-rest-comment-controller-6-9.php'; | |
| 66 | + | |
| 52 | 67 | // WordPress 7.0 compat. |
| 53 | - require __DIR__ . '/compat/wordpress-7.0/class-gutenberg-rest-revisions-controller.php'; | |
| 68 | + require __DIR__ . '/compat/wordpress-7.0/class-gutenberg-rest-autosaves-controller.php'; | |
| 54 | 69 | require __DIR__ . '/compat/wordpress-7.0/class-gutenberg-rest-block-patterns-controller-7-0.php'; |
| 55 | 70 | require __DIR__ . '/compat/wordpress-7.0/class-gutenberg-rest-templates-controller-7-0.php'; |
| 71 | + require __DIR__ . '/compat/wordpress-7.0/class-gutenberg-rest-static-templates-controller.php'; | |
| 56 | 72 | require __DIR__ . '/compat/wordpress-7.0/class-wp-icons-registry.php'; |
| 57 | 73 | require __DIR__ . '/compat/wordpress-7.0/class-wp-rest-icons-controller.php'; |
| 74 | + require __DIR__ . '/compat/wordpress-7.0/collaboration.php'; | |
| 75 | + require __DIR__ . '/compat/wordpress-7.0/template-activate.php'; | |
| 58 | 76 | require __DIR__ . '/compat/wordpress-7.0/rest-api.php'; |
| 59 | 77 | require __DIR__ . '/compat/wordpress-7.0/global-styles.php'; |
| 60 | 78 | |
| 61 | - // WordPress 7.1 compat. | |
| 62 | - require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-rest-attachments-controller-7-1.php'; | |
| 63 | - require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-view-config-data.php'; | |
| 64 | - require __DIR__ . '/compat/wordpress-7.1/view-config-api.php'; | |
| 65 | - require __DIR__ . '/compat/wordpress-7.1/class-gutenberg-rest-view-config-controller-7-1.php'; | |
| 66 | - require __DIR__ . '/compat/wordpress-7.1/notes-mentions.php'; | |
| 67 | - require __DIR__ . '/compat/wordpress-7.1/class-wp-icon-collections-registry.php'; | |
| 68 | - require __DIR__ . '/compat/wordpress-7.1/class-wp-rest-icon-collections-controller.php'; | |
| 69 | - require __DIR__ . '/compat/wordpress-7.1/rest-api.php'; | |
| 70 | - require __DIR__ . '/compat/wordpress-7.1/block-bindings.php'; | |
| 71 | - require __DIR__ . '/compat/wordpress-7.1/query-block.php'; | |
| 72 | - require __DIR__ . '/compat/wordpress-7.1/block-comments.php'; | |
| 73 | - | |
| 74 | - // WordPress 7.2 compat. | |
| 75 | - require __DIR__ . '/compat/wordpress-7.2/class-gutenberg-rest-templates-controller-7-2.php'; | |
| 76 | - require __DIR__ . '/compat/wordpress-7.2/view-config-api.php'; | |
| 77 | - require __DIR__ . '/compat/wordpress-7.2/class-gutenberg-rest-view-config-controller-7-2.php'; | |
| 78 | - require __DIR__ . '/compat/wordpress-7.2/rest-api.php'; | |
| 79 | - | |
| 80 | - // Real-time collaboration. | |
| 81 | - require __DIR__ . '/experimental/collaboration/class-gutenberg-rest-autosaves-controller.php'; | |
| 82 | - require __DIR__ . '/experimental/collaboration/rest-api.php'; | |
| 83 | - require __DIR__ . '/experimental/collaboration/collaboration.php'; | |
| 84 | - | |
| 85 | 79 | // Plugin specific code. |
| 86 | 80 | require_once __DIR__ . '/class-wp-rest-global-styles-controller-gutenberg.php'; |
| 87 | 81 | require_once __DIR__ . '/class-wp-rest-edit-site-export-controller-gutenberg.php'; |
| 88 | - require_once __DIR__ . '/class-wp-icons-registry-gutenberg.php'; | |
| 89 | - require_once __DIR__ . '/class-wp-rest-icons-controller-gutenberg.php'; | |
| 90 | 82 | require_once __DIR__ . '/rest-api.php'; |
| 91 | 83 | |
| 84 | + // Experimental autosaves controller override for real-time collaboration. | |
| 85 | + | |
| 92 | 86 | require_once __DIR__ . '/experimental/rest-api.php'; |
| 87 | + require_once __DIR__ . '/experimental/kses-allowed-html.php'; | |
| 93 | 88 | |
| 94 | 89 | require_once __DIR__ . '/experimental/class-gutenberg-hierarchical-sort.php'; |
| 95 | 90 | } |
| 96 | 91 | |
| @@ -100,34 +95,22 @@ | ||
| 100 | 95 | |
| 101 | 96 | // Gutenberg plugin compat. |
| 102 | 97 | require __DIR__ . '/compat/plugin/edit-site-routes-backwards-compat.php'; |
| 103 | 98 | require __DIR__ . '/compat/plugin/fonts.php'; |
| 104 | -require __DIR__ . '/compat/plugin/style-state-aliases.php'; | |
| 105 | 99 | |
| 106 | 100 | |
| 101 | +// WordPress 6.9 compat. | |
| 102 | +require __DIR__ . '/compat/wordpress-6.9/customizer-preview-custom-css.php'; | |
| 103 | +require __DIR__ . '/compat/wordpress-6.9/command-palette.php'; | |
| 104 | +require __DIR__ . '/compat/wordpress-6.9/client-assets.php'; | |
| 105 | + | |
| 107 | 106 | // WordPress 7.0 compat. |
| 108 | 107 | require __DIR__ . '/compat/wordpress-7.0/preload.php'; |
| 109 | 108 | require __DIR__ . '/compat/wordpress-7.0/auto-register.php'; |
| 110 | 109 | require __DIR__ . '/compat/wordpress-7.0/blocks.php'; |
| 111 | 110 | require __DIR__ . '/compat/wordpress-7.0/kses.php'; |
| 112 | -require __DIR__ . '/compat/wordpress-7.0/command-palette.php'; | |
| 113 | -require __DIR__ . '/compat/wordpress-7.0/script-modules.php'; | |
| 114 | -require __DIR__ . '/compat/wordpress-7.0/fonts.php'; | |
| 111 | +require __DIR__ . '/compat/wordpress-7.0/media.php'; | |
| 115 | 112 | |
| 116 | -if ( class_exists( '\WordPress\AiClient\AiClient' ) ) { | |
| 117 | - require __DIR__ . '/compat/wordpress-7.0/class-wp-connector-registry.php'; | |
| 118 | - require __DIR__ . '/compat/wordpress-7.0/connectors.php'; | |
| 119 | - require __DIR__ . '/compat/wordpress-7.0/default-connectors.php'; | |
| 120 | -} | |
| 121 | - | |
| 122 | -// WordPress 7.1 compat. | |
| 123 | -require __DIR__ . '/compat/wordpress-7.1/admin-bar.php'; | |
| 124 | -require __DIR__ . '/compat/wordpress-7.1/blocks.php'; | |
| 125 | -require __DIR__ . '/compat/wordpress-7.1/kses.php'; | |
| 126 | -require __DIR__ . '/compat/wordpress-7.1/media.php'; | |
| 127 | -require __DIR__ . '/compat/wordpress-7.1/preload.php'; | |
| 128 | -require __DIR__ . '/compat/wordpress-7.1/icons.php'; | |
| 129 | - | |
| 130 | 113 | // Experimental features. |
| 131 | 114 | require __DIR__ . '/experimental/block-editor-settings-mobile.php'; |
| 132 | 115 | require __DIR__ . '/experimental/blocks.php'; |
| 133 | 116 | require __DIR__ . '/experimental/navigation-theme-opt-in.php'; |
| @@ -133,24 +116,20 @@ | ||
| 133 | 116 | require __DIR__ . '/experimental/navigation-theme-opt-in.php'; |
| 134 | 117 | require __DIR__ . '/experimental/kses.php'; |
| 135 | 118 | require __DIR__ . '/experimental/script-modules.php'; |
| 136 | 119 | require __DIR__ . '/experimental/pages/site-editor.php'; |
| 137 | -require __DIR__ . '/experimental/collaboration/meta-box-rtc-compat.php'; | |
| 138 | - | |
| 139 | -if ( gutenberg_is_experiment_enabled( 'gutenberg-extensible-site-editor' ) ) { | |
| 140 | - require __DIR__ . '/experimental/extensible-site-editor.php'; | |
| 141 | - require __DIR__ . '/experimental/theme-preview/load.php'; | |
| 120 | +require __DIR__ . '/experimental/extensible-site-editor.php'; | |
| 121 | +require __DIR__ . '/experimental/fonts/load.php'; | |
| 122 | +if ( class_exists( '\WordPress\AiClient\AiClient' ) ) { | |
| 123 | + require __DIR__ . '/experimental/connectors/load.php'; | |
| 142 | 124 | } |
| 143 | 125 | |
| 144 | -if ( gutenberg_is_experiment_enabled( 'gutenberg-dataform-inspector' ) ) { | |
| 145 | - require __DIR__ . '/experimental/dataform-inspector-preload.php'; | |
| 126 | +if ( gutenberg_is_experiment_enabled( 'gutenberg-workflow-palette' ) ) { | |
| 127 | + require __DIR__ . '/experimental/workflow-palette.php'; | |
| 146 | 128 | } |
| 147 | -if ( gutenberg_is_experiment_enabled( 'gutenberg-media-editor' ) ) { | |
| 148 | - require __DIR__ . '/experimental/media-editor/load.php'; | |
| 149 | -} | |
| 150 | 129 | |
| 151 | -if ( gutenberg_is_experiment_enabled( 'gutenberg-workflow-palette' ) ) { | |
| 152 | - require __DIR__ . '/experimental/workflow-palette.php'; | |
| 130 | +if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) { | |
| 131 | + require __DIR__ . '/experimental/disable-tinymce.php'; | |
| 153 | 132 | } |
| 154 | 133 | |
| 155 | 134 | // Load the BC Layer to avoid fatal errors of extenders using the Fonts API. |
| 156 | 135 | // @core-merge: do not merge the BC layer files into WordPress Core. |
| @@ -179,9 +158,9 @@ | ||
| 179 | 158 | require __DIR__ . '/block-editor-settings.php'; |
| 180 | 159 | require __DIR__ . '/client-assets.php'; |
| 181 | 160 | require __DIR__ . '/mathml-kses.php'; |
| 182 | 161 | require __DIR__ . '/demo.php'; |
| 183 | -require __DIR__ . '/experimental/experiments/load.php'; | |
| 162 | +require __DIR__ . '/experiments-page.php'; | |
| 184 | 163 | require __DIR__ . '/interactivity-api.php'; |
| 185 | 164 | require __DIR__ . '/block-template-utils.php'; |
| 186 | 165 | |
| 187 | 166 | // Copied package PHP files. |
| @@ -211,9 +190,8 @@ | ||
| 211 | 190 | require __DIR__ . '/block-supports/aria-label.php'; |
| 212 | 191 | require __DIR__ . '/block-supports/anchor.php'; |
| 213 | 192 | require __DIR__ . '/block-supports/block-visibility.php'; |
| 214 | 193 | require __DIR__ . '/block-supports/custom-css.php'; |
| 215 | -require __DIR__ . '/block-supports/states.php'; | |
| 216 | 194 | |
| 217 | 195 | // Client-side media processing. |
| 218 | 196 | require_once __DIR__ . '/media/load.php'; |
| 219 | 197 | |
| @@ -225,18 +203,9 @@ | ||
| 225 | 203 | |
| 226 | 204 | // Block patterns for navigation overlays. |
| 227 | 205 | require __DIR__ . '/overlay-patterns.php'; |
| 228 | 206 | |
| 229 | -// Guidelines (only load when experiment is enabled). | |
| 230 | -if ( gutenberg_is_experiment_enabled( 'gutenberg-guidelines' ) ) { | |
| 231 | - require __DIR__ . '/experimental/knowledge/load.php'; | |
| 232 | - require __DIR__ . '/experimental/knowledge/index.php'; | |
| 233 | -} | |
| 234 | - | |
| 235 | -// Dashboard Widgets (only load when experiment is enabled). | |
| 236 | -if ( gutenberg_is_experiment_enabled( 'gutenberg-dashboard-widgets' ) ) { | |
| 237 | - require __DIR__ . '/experimental/dashboard-widgets/load.php'; | |
| 238 | - require __DIR__ . '/experimental/dashboard-widgets/widget-types.php'; | |
| 239 | - require __DIR__ . '/experimental/dashboard-widgets/widget-icons.php'; | |
| 240 | - require __DIR__ . '/experimental/dashboard-widgets/dashboard-layout.php'; | |
| 241 | - require __DIR__ . '/experimental/dashboard-widgets/default-layout-seed.php'; | |
| 207 | +// Content Guidelines (only load when experiment is enabled). | |
| 208 | +if ( gutenberg_is_experiment_enabled( 'gutenberg-content-guidelines' ) ) { | |
| 209 | + require __DIR__ . '/experimental/content-guidelines/load.php'; | |
| 210 | + require __DIR__ . '/experimental/content-guidelines/index.php'; | |
| 242 | 211 | } |
