Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
Merges [54769] to the 6.1 branch.
Fixes #56815.

Built from https://develop.svn.wordpress.org/branches/6.1@54772


git-svn-id: http://core.svn.wordpress.org/branches/6.1@54324 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Felix Arntz 2022-11-09 01:08:14 +00:00
parent f34c1f10d1
commit 65a6a14ed6
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/block-editor.php
View File

@ -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 */

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.1.1-alpha-54767';
$wp_version = '6.1.1-alpha-54772';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.