From 5f61131cc6eb9fbd8afd224ac177a85962363ecc Mon Sep 17 00:00:00 2001 From: Felix Arntz Date: Wed, 9 Nov 2022 00:30:10 +0000 Subject: [PATCH] Editor: Improve frontend performance for `get_default_block_editor_settings()`. The `wp_max_upload_size()` function can be expensive to call, especially for large sites or multisites. For the frontend usage of `get_default_block_editor_settings()` knowing the allowed upload size is typically unnecessary. This changeset adds a condition so that `wp_max_upload_size()` is only called if the current user can actually `upload_files`. It keeps the data present when it is actually needed while avoiding the execution overhead when it is not needed. Props janthiel, Clorith, flixos90, spacedmonkey. Fixes #56815. Built from https://develop.svn.wordpress.org/trunk@54769 git-svn-id: http://core.svn.wordpress.org/trunk@54321 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/block-editor.php | 11 ++++++++--- wp-includes/version.php | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/wp-includes/block-editor.php b/wp-includes/block-editor.php index 1c67e6cc7a..901ba21a3f 100644 --- a/wp-includes/block-editor.php +++ b/wp-includes/block-editor.php @@ -153,9 +153,14 @@ function get_allowed_block_types( $block_editor_context ) { */ function get_default_block_editor_settings() { // Media settings. - $max_upload_size = wp_max_upload_size(); - if ( ! $max_upload_size ) { - $max_upload_size = 0; + + // wp_max_upload_size() can be expensive, so only call it when relevant for the current user. + $max_upload_size = 0; + if ( current_user_can( 'upload_files' ) ) { + $max_upload_size = wp_max_upload_size(); + if ( ! $max_upload_size ) { + $max_upload_size = 0; + } } /** This filter is documented in wp-admin/includes/media.php */ diff --git a/wp-includes/version.php b/wp-includes/version.php index e93cd3ce4c..28bf2a8eb5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54768'; +$wp_version = '6.2-alpha-54769'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.