diff --git a/includes/Data/Plugins.php b/includes/Data/Plugins.php index 711c1a4eb..6c20fcfa5 100644 --- a/includes/Data/Plugins.php +++ b/includes/Data/Plugins.php @@ -241,7 +241,7 @@ public static function get() { public static function get_squashed() { return array_merge( array_filter( self::$wp_slugs, array( __CLASS__, 'check_approved' ) ) , - array_filter( self::$nfd_slugs, array( __CLASS__, 'check_approved' ) ) , + array_filter( self::$nfd_slugs, array( __CLASS__, 'check_approved' ) ) ); } diff --git a/includes/RestApi/PluginsController.php b/includes/RestApi/PluginsController.php index 039c4dfb8..2af786df3 100644 --- a/includes/RestApi/PluginsController.php +++ b/includes/RestApi/PluginsController.php @@ -306,13 +306,13 @@ public function set_site_features( \WP_REST_Request $request ) { PluginInstallTaskManager::add_to_queue( new PluginInstallTask( $plugin, - true, + true ) ); } else { PluginUninstallTaskManager::add_to_queue( new PluginUninstallTask( - $plugin, + $plugin ) ); } diff --git a/includes/RestApi/Themes/ThemeVariationsController.php b/includes/RestApi/Themes/ThemeVariationsController.php index 5d99238c0..11e03cc86 100644 --- a/includes/RestApi/Themes/ThemeVariationsController.php +++ b/includes/RestApi/Themes/ThemeVariationsController.php @@ -136,7 +136,7 @@ public function get_theme_variations( \WP_REST_Request $request ) { return array_merge( array( $active_variation_global_style ), - self::get_style_variations(), + self::get_style_variations() ); } diff --git a/includes/TaskManagers/PluginUninstallTaskManager.php b/includes/TaskManagers/PluginUninstallTaskManager.php index 666dfd381..d4af9a7e1 100644 --- a/includes/TaskManagers/PluginUninstallTaskManager.php +++ b/includes/TaskManagers/PluginUninstallTaskManager.php @@ -114,9 +114,9 @@ public static function add_to_queue( PluginUninstallTask $plugin_uninstall_task $position_in_queue = PluginInstallTaskManager::status( $plugin_uninstall_task->get_slug() ); if ( $position_in_queue !== false && $position_in_queue !== 0 ) { PluginInstallTaskManager::remove_from_queue( - $plugin_uninstall_task->get_slug(), + $plugin_uninstall_task->get_slug() ); - + return true; }