From df52b08c0b8b2eb50362a8c46fd80716296094ad Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Mon, 9 Aug 2021 11:18:55 +0400 Subject: [PATCH 1/2] Editor Settings: Avoid losing original template keys --- src/wp-admin/edit-form-blocks.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php index 3a399c2fcdfd0..1aec8be530902 100644 --- a/src/wp-admin/edit-form-blocks.php +++ b/src/wp-admin/edit-form-blocks.php @@ -119,12 +119,12 @@ function( $classes ) { * besides the default value. */ $available_templates = wp_get_theme()->get_page_templates( get_post( $post->ID ) ); -$available_templates = ! empty( $available_templates ) ? array_merge( +$available_templates = ! empty( $available_templates ) ? array_replace( + $available_templates, array( /** This filter is documented in wp-admin/includes/meta-boxes.php */ '' => apply_filters( 'default_page_template_title', __( 'Default template' ), 'rest-api' ), - ), - $available_templates + ) ) : $available_templates; // Lock settings. From 243c0f38968d1b11743ee548e2065dd6d7a897b2 Mon Sep 17 00:00:00 2001 From: George Mamadashvili Date: Mon, 9 Aug 2021 19:09:52 +0400 Subject: [PATCH 2/2] Swap argument order --- src/wp-admin/edit-form-blocks.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wp-admin/edit-form-blocks.php b/src/wp-admin/edit-form-blocks.php index 1aec8be530902..fa4b8a9dd17e6 100644 --- a/src/wp-admin/edit-form-blocks.php +++ b/src/wp-admin/edit-form-blocks.php @@ -120,11 +120,11 @@ function( $classes ) { */ $available_templates = wp_get_theme()->get_page_templates( get_post( $post->ID ) ); $available_templates = ! empty( $available_templates ) ? array_replace( - $available_templates, array( /** This filter is documented in wp-admin/includes/meta-boxes.php */ '' => apply_filters( 'default_page_template_title', __( 'Default template' ), 'rest-api' ), - ) + ), + $available_templates ) : $available_templates; // Lock settings.