From aa0ed0fcdd083a179dff3974ba19e75dba5e8033 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 31 Jul 2021 10:32:56 +0000 Subject: [PATCH] Upgrade/Install: Skip any `node_modules` directories when removing Genericons `example.html` files on update. This can significantly reduce the time required to complete the process in a development environment. Follow-up to [32386]. Props bobbingwide, afragen, desrosj, SergeyBiryukov. Fixes #52765. Built from https://develop.svn.wordpress.org/trunk@51521 git-svn-id: http://core.svn.wordpress.org/trunk@51132 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/update-core.php | 7 +++++++ wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 329ec20152..77ede74c77 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -1656,6 +1656,13 @@ function _upgrade_422_find_genericons_files_in_folder( $directory ) { } $dirs = glob( $directory . '*', GLOB_ONLYDIR ); + $dirs = array_filter( + $dirs, + function( $dir ) { + // Skip any node_modules directories. + return false === strpos( $dir, 'node_modules' ); + } + ); if ( $dirs ) { foreach ( $dirs as $dir ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 78f3c0cdfb..20a041782c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-alpha-51520'; +$wp_version = '5.9-alpha-51521'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.