Skip to content
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

Changes for FSE backport in core #36201

Merged
merged 20 commits into from
Nov 5, 2021
Merged

Changes for FSE backport in core #36201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
157af1e
Changes for FSE backport in core
ntsekouras Nov 4, 2021
55d6173
split files
ntsekouras Nov 4, 2021
f7bda38
rename files
ntsekouras Nov 4, 2021
11e116b
more changes
ntsekouras Nov 4, 2021
882f021
rename gutenberg_get_block_template
ntsekouras Nov 4, 2021
a6e8def
rename _gutenberg_build_template_result_from_post
ntsekouras Nov 4, 2021
939489d
rename gutenberg_get_default_template_types
ntsekouras Nov 4, 2021
88612a6
rename _gutenberg_get_template_file
ntsekouras Nov 4, 2021
9029417
rename _gutenberg_add_template_info + _gutenberg_add_template_part_ar…
ntsekouras Nov 4, 2021
679bd49
rename gutenberg_get_block_file_template
ntsekouras Nov 4, 2021
a44cb1b
rename _gutenberg_build_template_result_from_file
ntsekouras Nov 4, 2021
ce18660
rename gutenberg_filter_template_part_area
ntsekouras Nov 4, 2021
f3f4519
reorder functions to match core file
ntsekouras Nov 4, 2021
6788aea
rename _gutenberg_get_template_files
ntsekouras Nov 4, 2021
ce829f5
fix get_block_templates
ntsekouras Nov 4, 2021
ec558ec
load utils earlier
ntsekouras Nov 4, 2021
bc011db
rename test functions
ntsekouras Nov 4, 2021
91d63d4
add back `gutenberg` prefix in get_block_template and get_block_templ…
ntsekouras Nov 5, 2021
529df1f
move templates controller to compat/5.9
ntsekouras Nov 5, 2021
76645bf
rename to `gutenberg_set_unique_slug_on_create_template_part` and bai…
ntsekouras Nov 5, 2021
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
828 changes: 828 additions & 0 deletions lib/compat/wordpress-5.9/block-template-utils.php
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...s-gutenberg-rest-templates-controller.php → ...s-gutenberg-rest-templates-controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function get_item_permissions_check( $request ) {
*/
public function get_item( $request ) {
if ( isset( $request['source'] ) && 'theme' === $request['source'] ) {
$template = gutenberg_get_block_file_template( $request['id'], $this->post_type );
$template = get_block_file_template( $request['id'], $this->post_type );
} else {
$template = gutenberg_get_block_template( $request['id'], $this->post_type );
}
Expand Down Expand Up @@ -209,7 +209,7 @@ public function update_item( $request ) {

if ( isset( $request['source'] ) && 'theme' === $request['source'] ) {
wp_delete_post( $template->wp_id, true );
return $this->prepare_item_for_response( gutenberg_get_block_file_template( $request['id'], $this->post_type ), $request );
return $this->prepare_item_for_response( get_block_file_template( $request['id'], $this->post_type ), $request );
}

$changes = $this->prepare_item_for_database( $request );
Expand Down Expand Up @@ -377,9 +377,9 @@ protected function prepare_item_for_database( $request ) {

if ( 'wp_template_part' === $this->post_type ) {
if ( isset( $request['area'] ) ) {
$changes->tax_input['wp_template_part_area'] = gutenberg_filter_template_part_area( $request['area'] );
$changes->tax_input['wp_template_part_area'] = _filter_block_template_part_area( $request['area'] );
} elseif ( null !== $template && 'custom' !== $template->source && $template->area ) {
$changes->tax_input['wp_template_part_area'] = gutenberg_filter_template_part_area( $template->area );
$changes->tax_input['wp_template_part_area'] = _filter_block_template_part_area( $template->area );
} elseif ( ! $template->area ) {
$changes->tax_input['wp_template_part_area'] = WP_TEMPLATE_PART_AREA_UNCATEGORIZED;
}
Expand Down
Loading