From 91936df3d1c71d69deb03ca6bd411deeb013a4dc Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 17 May 2020 09:39:11 +0000 Subject: [PATCH] Coding Standards: Fix WPCS issues in plugin and theme upgrader classes. See #49542. Built from https://develop.svn.wordpress.org/trunk@47814 git-svn-id: http://core.svn.wordpress.org/trunk@47590 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-plugin-upgrader.php | 2 +- wp-admin/includes/class-theme-upgrader-skin.php | 2 +- wp-admin/includes/class-theme-upgrader.php | 2 +- wp-includes/version.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-admin/includes/class-plugin-upgrader.php b/wp-admin/includes/class-plugin-upgrader.php index 214f371866..361b7a5c8d 100644 --- a/wp-admin/includes/class-plugin-upgrader.php +++ b/wp-admin/includes/class-plugin-upgrader.php @@ -553,7 +553,7 @@ class Plugin_Upgrader extends WP_Upgrader { // If plugin is in its own directory, recursively delete the directory. // Base check on if plugin includes directory separator AND that it's not the root plugin folder. - if ( strpos( $plugin, '/' ) && $this_plugin_dir != $plugins_dir ) { + if ( strpos( $plugin, '/' ) && $this_plugin_dir !== $plugins_dir ) { $deleted = $wp_filesystem->delete( $this_plugin_dir, true ); } else { $deleted = $wp_filesystem->delete( $plugins_dir . $plugin ); diff --git a/wp-admin/includes/class-theme-upgrader-skin.php b/wp-admin/includes/class-theme-upgrader-skin.php index 31e540bca1..9be8894905 100644 --- a/wp-admin/includes/class-theme-upgrader-skin.php +++ b/wp-admin/includes/class-theme-upgrader-skin.php @@ -65,7 +65,7 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin { admin_url( 'customize.php' ) ); - if ( get_stylesheet() == $stylesheet ) { + if ( get_stylesheet() === $stylesheet ) { if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) { $update_actions['preview'] = sprintf( '' . diff --git a/wp-admin/includes/class-theme-upgrader.php b/wp-admin/includes/class-theme-upgrader.php index 9d561c0893..d5da2344c7 100644 --- a/wp-admin/includes/class-theme-upgrader.php +++ b/wp-admin/includes/class-theme-upgrader.php @@ -577,7 +577,7 @@ class Theme_Upgrader extends WP_Upgrader { } // Ensure stylesheet name hasn't changed after the upgrade: - if ( get_stylesheet() === $theme && $theme != $this->result['destination_name'] ) { + if ( get_stylesheet() === $theme && $theme !== $this->result['destination_name'] ) { wp_clean_themes_cache(); $stylesheet = $this->result['destination_name']; switch_theme( $stylesheet ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 8deed5703c..0305c669dc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-47813'; +$wp_version = '5.5-alpha-47814'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.