vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Editor: Improve frontend performance for get_default_block_editor_settings().

Browse Source 
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.


git-svn-id: https://develop.svn.wordpress.org/trunk@54769 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz
2022-11-09 00:28:33 +00:00
parent fba9680eda
commit b8bf29746a
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/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 */

25
tests/phpunit/tests/blocks/editor.php
View File

@@ -301,6 +301,31 @@ class Tests_Blocks_Editor extends WP_UnitTestCase {
$this->assertTrue( $settings['__unstableGalleryWithImageBlocks'] );
}
/**
* @ticket 56815
*/
public function test_get_default_block_editor_settings_max_upload_file_size() {
// Force the return value of wp_max_upload_size() to be 500.
add_filter(
'upload_size_limit',
function() {
return 500;
}
);
// Expect 0 when user is not allowed to upload (as wp_max_upload_size() should not be called).
$settings = get_default_block_editor_settings();
$this->assertSame( 0, $settings['maxUploadFileSize'] );
// Set up an administrator, as they can upload files.
$administrator = self::factory()->user->create( array( 'role' => 'administrator' ) );
wp_set_current_user( $administrator );
// Expect the above 500 as the user is now allowed to upload.
$settings = get_default_block_editor_settings();
$this->assertSame( 500, $settings['maxUploadFileSize'] );
}
/**
* @ticket 53397
*/