Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Upgrade/Install: Revert a temporary conditional for testing the Rollbacks feature project.

Browse Source 
This will be readded in 6.2-alpha after a 6.1 branch is created.

Follow-up to [53578].

See #56057.
Built from https://develop.svn.wordpress.org/trunk@54484


git-svn-id: http://core.svn.wordpress.org/trunk@54043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-10-11 15:28:13 +00:00
parent 23d251e0ab
commit 08dd56a8b1
3 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wp-admin/includes/class-wp-upgrader.php
View File

@ -594,23 +594,7 @@ class WP_Upgrader {
}
// Copy new version of item into place.
if ( class_exists( 'Rollback_Update_Failure\WP_Upgrader' )
&& function_exists( '\Rollback_Update_Failure\move_dir' )
) {
/*
* If the {@link https://wordpress.org/plugins/rollback-update-failure/ Rollback Update Failure}
* feature plugin is installed, use the move_dir() function from there for better performance.
* Instead of copying a directory from one location to another, it uses the rename() PHP function
* to speed up the process. If the renaming failed, it falls back to copy_dir().
*
* This condition aims to facilitate broader testing of the Rollbacks (temp backups) feature project.
* It is temporary, until the plugin is merged into core.
*/
$result = \Rollback_Update_Failure\move_dir( $source, $remote_destination );
} else {
$result = copy_dir( $source, $remote_destination );
}
$result = copy_dir( $source, $remote_destination );
if ( is_wp_error( $result ) ) {
if ( $args['clear_working'] ) {
$wp_filesystem->delete( $remote_source, true );

1
wp-includes/blocks/template-part.php
View File

@ -193,7 +193,6 @@ function build_template_part_block_instance_variations() {
if ( wp_installing() ) {
return array();
}
$variations = array();
$template_parts = get_block_templates(
array(

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.1-beta3-54483';
$wp_version = '6.1-beta3-54484';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.