-
Notifications
You must be signed in to change notification settings - Fork 4.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'trunk' into focal-point-40px
- Loading branch information
Showing
182 changed files
with
3,391 additions
and
1,345 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| https://github.com/WordPress/wordpress-develop/pull/7145 | ||
|
|
||
| * https://github.com/WordPress/gutenberg/pull/64076 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| https://github.com/WordPress/wordpress-develop/pull/7125 | ||
|
|
||
| * https://github.com/WordPress/gutenberg/pull/61577 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| https://github.com/WordPress/wordpress-develop/pull/7179 | ||
|
|
||
| * https://github.com/WordPress/gutenberg/pull/64401 | ||
| * https://github.com/WordPress/gutenberg/pull/64459 | ||
| * https://github.com/WordPress/gutenberg/pull/64477 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <?php | ||
| /** | ||
| * Block template functions. | ||
| * | ||
| * @package gutenberg | ||
| */ | ||
|
|
||
| if ( ! function_exists( 'wp_register_block_template' ) ) { | ||
| /** | ||
| * Register a template. | ||
| * | ||
| * @param string $template_name Template name in the form of `plugin_uri//template_name`. | ||
| * @param array|string $args Object type or array of object types with which the taxonomy should be associated. | ||
| * @param array|string $args { | ||
| * @type string $title Optional. Title of the template as it will be shown in the Site Editor | ||
| * and other UI elements. | ||
| * @type string $description Optional. Description of the template as it will be shown in the Site | ||
| * Editor. | ||
| * @type string $content Optional. Default content of the template that will be used when the | ||
| * template is rendered or edited in the editor. | ||
| * @type string[] $post_types Optional. Array of post types to which the template should be available. | ||
| * @type string $plugin Uri of the plugin that registers the template. | ||
| * } | ||
| * @return WP_Block_Template|WP_Error The registered template object on success, WP_Error object on failure. | ||
| */ | ||
| function wp_register_block_template( $template_name, $args = array() ) { | ||
| return WP_Block_Templates_Registry::get_instance()->register( $template_name, $args ); | ||
| } | ||
| } | ||
|
|
||
| if ( ! function_exists( 'wp_unregister_block_template' ) ) { | ||
| /** | ||
| * Unregister a template. | ||
| * | ||
| * @param string $template_name Template name in the form of `plugin_uri//template_name`. | ||
| * @return true|WP_Error True on success, WP_Error on failure or if the template doesn't exist. | ||
| */ | ||
| function wp_unregister_block_template( $template_name ) { | ||
| return WP_Block_Templates_Registry::get_instance()->unregister( $template_name ); | ||
| } | ||
| } |
203 changes: 203 additions & 0 deletions
203
lib/compat/wordpress-6.7/class-gutenberg-rest-templates-controller-6-7.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,203 @@ | ||
| <?php | ||
| /** | ||
| * REST API: Gutenberg_REST_Templates_Controller_6_7 class | ||
| * | ||
| * @package gutenberg | ||
| */ | ||
|
|
||
| /** | ||
| * Gutenberg_REST_Templates_Controller_6_7 class | ||
| * | ||
| */ | ||
| class Gutenberg_REST_Templates_Controller_6_7 extends Gutenberg_REST_Templates_Controller_6_6 { | ||
| /** | ||
| * Returns the given template | ||
| * | ||
| * @param WP_REST_Request $request The request instance. | ||
| * @return WP_REST_Response|WP_Error | ||
| */ | ||
| public function get_item( $request ) { | ||
| if ( isset( $request['source'] ) && ( 'theme' === $request['source'] || 'plugin' === $request['source'] ) ) { | ||
| $template = get_block_file_template( $request['id'], $this->post_type ); | ||
| } else { | ||
| $template = get_block_template( $request['id'], $this->post_type ); | ||
| } | ||
|
|
||
| if ( ! $template ) { | ||
| return new WP_Error( 'rest_template_not_found', __( 'No templates exist with that id.' ), array( 'status' => 404 ) ); | ||
| } | ||
|
|
||
| return $this->prepare_item_for_response( $template, $request ); | ||
| } | ||
|
|
||
| /** | ||
| * Prepare a single template output for response | ||
| * | ||
| * @param WP_Block_Template $item Template instance. | ||
| * @param WP_REST_Request $request Request object. | ||
| * @return WP_REST_Response Response object. | ||
| */ | ||
| // @core-merge: Fix wrong author in plugin templates. | ||
| public function prepare_item_for_response( $item, $request ) { | ||
| $template = $item; | ||
|
|
||
| $fields = $this->get_fields_for_response( $request ); | ||
|
|
||
| if ( 'plugin' !== $item->origin ) { | ||
| return parent::prepare_item_for_response( $item, $request ); | ||
| } | ||
| $cloned_item = clone $item; | ||
| // Set the origin as theme when calling the previous `prepare_item_for_response()` to prevent warnings when generating the author text. | ||
| $cloned_item->origin = 'theme'; | ||
| $response = parent::prepare_item_for_response( $cloned_item, $request ); | ||
| $data = $response->data; | ||
|
|
||
| if ( rest_is_field_included( 'origin', $fields ) ) { | ||
| $data['origin'] = 'plugin'; | ||
| } | ||
|
|
||
| if ( rest_is_field_included( 'plugin', $fields ) ) { | ||
| $registered_template = WP_Block_Templates_Registry::get_instance()->get_by_slug( $cloned_item->slug ); | ||
| if ( $registered_template ) { | ||
| $data['plugin'] = $registered_template->plugin; | ||
| } | ||
| } | ||
|
|
||
| if ( rest_is_field_included( 'author_text', $fields ) ) { | ||
| $data['author_text'] = $this->get_wp_templates_author_text_field( $template ); | ||
| } | ||
|
|
||
| if ( rest_is_field_included( 'original_source', $fields ) ) { | ||
| $data['original_source'] = $this->get_wp_templates_original_source_field( $template ); | ||
| } | ||
|
|
||
| $response = rest_ensure_response( $data ); | ||
|
|
||
| if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) { | ||
| $links = $this->prepare_links( $template->id ); | ||
| $response->add_links( $links ); | ||
| if ( ! empty( $links['self']['href'] ) ) { | ||
| $actions = $this->get_available_actions(); | ||
| $self = $links['self']['href']; | ||
| foreach ( $actions as $rel ) { | ||
| $response->add_link( $rel, $self ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return $response; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the source from where the template originally comes from. | ||
| * | ||
| * @param WP_Block_Template $template_object Template instance. | ||
| * @return string Original source of the template one of theme, plugin, site, or user. | ||
| */ | ||
| // @core-merge: Changed the comments format (from inline to multi-line) in the entire function. | ||
| private static function get_wp_templates_original_source_field( $template_object ) { | ||
| if ( 'wp_template' === $template_object->type || 'wp_template_part' === $template_object->type ) { | ||
| /* | ||
| * Added by theme. | ||
| * Template originally provided by a theme, but customized by a user. | ||
| * Templates originally didn't have the 'origin' field so identify | ||
| * older customized templates by checking for no origin and a 'theme' | ||
| * or 'custom' source. | ||
| */ | ||
| if ( $template_object->has_theme_file && | ||
| ( 'theme' === $template_object->origin || ( | ||
| empty( $template_object->origin ) && in_array( | ||
| $template_object->source, | ||
| array( | ||
| 'theme', | ||
| 'custom', | ||
| ), | ||
| true | ||
| ) ) | ||
| ) | ||
| ) { | ||
| return 'theme'; | ||
| } | ||
|
|
||
| // Added by plugin. | ||
| // @core-merge: Removed `$template_object->has_theme_file` check from this if clause. | ||
| if ( 'plugin' === $template_object->origin ) { | ||
| return 'plugin'; | ||
| } | ||
|
|
||
| /* | ||
| * Added by site. | ||
| * Template was created from scratch, but has no author. Author support | ||
| * was only added to templates in WordPress 5.9. Fallback to showing the | ||
| * site logo and title. | ||
| */ | ||
| if ( empty( $template_object->has_theme_file ) && 'custom' === $template_object->source && empty( $template_object->author ) ) { | ||
| return 'site'; | ||
| } | ||
| } | ||
|
|
||
| // Added by user. | ||
| return 'user'; | ||
| } | ||
|
|
||
| /** | ||
| * Returns a human readable text for the author of the template. | ||
| * | ||
| * @param WP_Block_Template $template_object Template instance. | ||
| * @return string Human readable text for the author. | ||
| */ | ||
| private static function get_wp_templates_author_text_field( $template_object ) { | ||
| $original_source = self::get_wp_templates_original_source_field( $template_object ); | ||
| switch ( $original_source ) { | ||
| case 'theme': | ||
| $theme_name = wp_get_theme( $template_object->theme )->get( 'Name' ); | ||
| return empty( $theme_name ) ? $template_object->theme : $theme_name; | ||
| case 'plugin': | ||
| // @core-merge: Prioritize plugin name instead of theme name for plugin-registered templates. | ||
| if ( ! function_exists( 'get_plugins' ) || ! function_exists( 'get_plugin_data' ) ) { | ||
| require_once ABSPATH . 'wp-admin/includes/plugin.php'; | ||
| } | ||
| if ( isset( $template_object->plugin ) ) { | ||
| $plugins = wp_get_active_and_valid_plugins(); | ||
|
|
||
| foreach ( $plugins as $plugin_file ) { | ||
| $plugin_basename = plugin_basename( $plugin_file ); | ||
| // Split basename by '/' to get the plugin slug. | ||
| list( $plugin_slug, ) = explode( '/', $plugin_basename ); | ||
|
|
||
| if ( $plugin_slug === $template_object->plugin ) { | ||
| $plugin_data = get_plugin_data( $plugin_file ); | ||
|
|
||
| if ( ! empty( $plugin_data['Name'] ) ) { | ||
| return $plugin_data['Name']; | ||
| } | ||
|
|
||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| * Fall back to the theme name if the plugin is not defined. That's needed to keep backwards | ||
| * compatibility with templates that were registered before the plugin attribute was added. | ||
| */ | ||
| $plugins = get_plugins(); | ||
| $plugin_basename = plugin_basename( sanitize_text_field( $template_object->theme . '.php' ) ); | ||
| if ( isset( $plugins[ $plugin_basename ] ) && isset( $plugins[ $plugin_basename ]['Name'] ) ) { | ||
| return $plugins[ $plugin_basename ]['Name']; | ||
| } | ||
| return isset( $template_object->plugin ) ? | ||
| $template_object->plugin : | ||
| $template_object->theme; | ||
| // @core-merge: End of changes to merge in core. | ||
| case 'site': | ||
| return get_bloginfo( 'name' ); | ||
| case 'user': | ||
| $author = get_user_by( 'id', $template_object->author ); | ||
| if ( ! $author ) { | ||
| return __( 'Unknown author' ); | ||
| } | ||
| return $author->get( 'display_name' ); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.