diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/edit-form-blocks.php --- a/wp/wp-admin/edit-form-blocks.php Tue Oct 22 16:11:46 2019 +0200 +++ b/wp/wp-admin/edit-form-blocks.php Tue Dec 15 13:49:49 2020 +0100 @@ -1,6 +1,6 @@ ID ), ); /** @@ -58,8 +59,8 @@ * * @since 5.0.0 * - * @param array $preload_paths Array of paths to preload. - * @param object $post The post resource data. + * @param string[] $preload_paths Array of paths to preload. + * @param WP_Post $post Post being edited. */ $preload_paths = apply_filters( 'block_editor_preload_paths', $preload_paths, $post ); @@ -131,9 +132,12 @@ * Initialize the editor. */ -$align_wide = get_theme_support( 'align-wide' ); -$color_palette = current( (array) get_theme_support( 'editor-color-palette' ) ); -$font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) ); +$align_wide = get_theme_support( 'align-wide' ); +$color_palette = current( (array) get_theme_support( 'editor-color-palette' ) ); +$font_sizes = current( (array) get_theme_support( 'editor-font-sizes' ) ); +$gradient_presets = current( (array) get_theme_support( 'editor-gradient-presets' ) ); +$custom_line_height = get_theme_support( 'custom-line-height' ); +$custom_units = get_theme_support( 'custom-units' ); /** * Filters the allowed block types for the editor, defaulting to true (all @@ -143,14 +147,16 @@ * * @param bool|array $allowed_block_types Array of block type slugs, or * boolean to enable/disable all. - * @param object $post The post resource data. + * @param WP_Post $post The post resource data. */ $allowed_block_types = apply_filters( 'allowed_block_types', true, $post ); -// Get all available templates for the post/page attributes meta-box. -// The "Default template" array element should only be added if the array is -// not empty so we do not trigger the template select element without any options -// besides the default value. +/* + * Get all available templates for the post/page attributes meta-box. + * The "Default template" array element should only be added if the array is + * not empty so we do not trigger the template select element without any options + * besides the default value. + */ $available_templates = wp_get_theme()->get_page_templates( get_post( $post->ID ) ); $available_templates = ! empty( $available_templates ) ? array_merge( array( @@ -175,7 +181,7 @@ ), ); -/* Translators: Use this to specify the CSS font family for the default font */ +/* translators: Use this to specify the CSS font family for the default font. */ $locale_font_family = esc_html_x( 'Noto Serif', 'CSS Font Family for Editor Font' ); $styles[] = array( 'css' => "body { font-family: '$locale_font_family' }", @@ -223,6 +229,15 @@ ); } +$image_dimensions = array(); +$all_sizes = wp_get_registered_image_subsizes(); +foreach ( $available_image_sizes as $size ) { + $key = $size['slug']; + if ( isset( $all_sizes[ $key ] ) ) { + $image_dimensions[ $key ] = $all_sizes[ $key ]; + } +} + // Lock settings. $user_id = wp_check_post_lock( $post->ID ); if ( $user_id ) { @@ -249,9 +264,13 @@ } else { // Lock the post. $active_post_lock = wp_set_post_lock( $post->ID ); - $lock_details = array( + if ( $active_post_lock ) { + $active_post_lock = esc_attr( implode( ':', $active_post_lock ) ); + } + + $lock_details = array( 'isLocked' => false, - 'activePostLock' => esc_attr( implode( ':', $active_post_lock ) ), + 'activePostLock' => $active_post_lock, ); } @@ -266,32 +285,38 @@ $body_placeholder = apply_filters( 'write_your_story', __( 'Start writing or type / to choose a block' ), $post ); $editor_settings = array( - 'alignWide' => $align_wide, - 'availableTemplates' => $available_templates, - 'allowedBlockTypes' => $allowed_block_types, - 'disableCustomColors' => get_theme_support( 'disable-custom-colors' ), - 'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ), - 'disablePostFormats' => ! current_theme_supports( 'post-formats' ), + 'alignWide' => $align_wide, + 'availableTemplates' => $available_templates, + 'allowedBlockTypes' => $allowed_block_types, + 'disableCustomColors' => get_theme_support( 'disable-custom-colors' ), + 'disableCustomFontSizes' => get_theme_support( 'disable-custom-font-sizes' ), + 'disableCustomGradients' => get_theme_support( 'disable-custom-gradients' ), + 'disablePostFormats' => ! current_theme_supports( 'post-formats' ), /** This filter is documented in wp-admin/edit-form-advanced.php */ - 'titlePlaceholder' => apply_filters( 'enter_title_here', __( 'Add title' ), $post ), - 'bodyPlaceholder' => $body_placeholder, - 'isRTL' => is_rtl(), - 'autosaveInterval' => AUTOSAVE_INTERVAL, - 'maxUploadFileSize' => $max_upload_size, - 'allowedMimeTypes' => get_allowed_mime_types(), - 'styles' => $styles, - 'imageSizes' => $available_image_sizes, - 'richEditingEnabled' => user_can_richedit(), - 'postLock' => $lock_details, - 'postLockUtils' => array( + 'titlePlaceholder' => apply_filters( 'enter_title_here', __( 'Add title' ), $post ), + 'bodyPlaceholder' => $body_placeholder, + 'isRTL' => is_rtl(), + 'autosaveInterval' => AUTOSAVE_INTERVAL, + 'maxUploadFileSize' => $max_upload_size, + 'allowedMimeTypes' => get_allowed_mime_types(), + 'styles' => $styles, + 'imageSizes' => $available_image_sizes, + 'imageDimensions' => $image_dimensions, + 'richEditingEnabled' => user_can_richedit(), + 'postLock' => $lock_details, + 'postLockUtils' => array( 'nonce' => wp_create_nonce( 'lock-post_' . $post->ID ), 'unlockNonce' => wp_create_nonce( 'update-post_' . $post->ID ), 'ajaxUrl' => admin_url( 'admin-ajax.php' ), ), + '__experimentalBlockPatterns' => WP_Block_Patterns_Registry::get_instance()->get_all_registered(), + '__experimentalBlockPatternCategories' => WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered(), // Whether or not to load the 'postcustom' meta box is stored as a user meta // field so that we're not always loading its assets. - 'enableCustomFields' => (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ), + 'enableCustomFields' => (bool) get_user_meta( get_current_user_id(), 'enable_custom_fields', true ), + 'enableCustomLineHeight' => $custom_line_height, + 'enableCustomUnits' => $custom_units, ); $autosave = wp_get_post_autosave( $post_ID ); @@ -313,6 +338,10 @@ $editor_settings['fontSizes'] = $font_sizes; } +if ( false !== $gradient_presets ) { + $editor_settings['gradients'] = $gradient_presets; +} + if ( ! empty( $post_type_object->template ) ) { $editor_settings['template'] = $post_type_object->template; $editor_settings['templateLock'] = ! empty( $post_type_object->template_lock ) ? $post_type_object->template_lock : false; @@ -337,6 +366,7 @@ wp_tinymce_inline_scripts(); wp_enqueue_editor(); + /** * Styles */ @@ -356,7 +386,7 @@ do_action( 'enqueue_block_editor_assets' ); // In order to duplicate classic meta box behaviour, we need to run the classic meta box actions. -require_once( ABSPATH . 'wp-admin/includes/meta-boxes.php' ); +require_once ABSPATH . 'wp-admin/includes/meta-boxes.php'; register_and_do_post_meta_boxes( $post ); // Check if the Custom Fields meta box has been removed at some point. @@ -394,7 +424,7 @@ ); wp_add_inline_script( 'wp-edit-post', $script ); -require_once( ABSPATH . 'wp-admin/admin-header.php' ); +require_once ABSPATH . 'wp-admin/admin-header.php'; ?>
@@ -411,9 +441,9 @@

Classic Editor plugin.' ), - __( 'https://wordpress.org/plugins/classic-editor/' ) + esc_url( wp_nonce_url( self_admin_url( 'plugin-install.php?tab=favorites&user=wordpressdotorg&save=0' ), 'save_wporg_username_' . get_current_user_id() ) ) ); /**