Skip to content

Commit b62a7e4

Browse files
committed
fix to coderabbit's qa
1 parent 032a901 commit b62a7e4

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/welcome/useful-plugins.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ const PluginCard = ( { plugin } ) => {
7171
return newStatus
7272
} )
7373

74+
// formData is empty
75+
if ( formData.entries().next().done ) {
76+
return
77+
}
78+
7479
// Perform Ajax request to install or activate plugin
7580
apiFetch( {
7681
url: ajaxUrl,

src/welcome/useful-plugins.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,7 @@ public function get_useful_plugins_info() {
9494
if ( ! function_exists( 'plugins_api' ) ) {
9595
include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
9696
}
97-
if ( ! function_exists( 'get_plugins' ) ) {
98-
include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
99-
}
100-
101-
if ( ! function_exists( 'is_plugin_active' ) ) {
97+
if ( ! function_exists( 'get_plugins' ) || ! function_exists( 'is_plugin_active' ) ) {
10298
include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
10399
}
104100

@@ -123,7 +119,8 @@ public function get_useful_plugins_info() {
123119

124120
$icon_url = '';
125121
if ( ! is_wp_error( $plugin_info ) && isset( $plugin_info->icons )
126-
&& is_array( $plugin_info->icons ) && ! empty( $plugin_info->icons ) ) {
122+
&& is_array( $plugin_info->icons ) && ! empty( $plugin_info->icons )
123+
) {
127124
$icon_url = array_values( $plugin_info->icons )[0];
128125
}
129126

@@ -169,7 +166,7 @@ public function add_cimo_args_to_localize_editor( $data_to_localize, $current_us
169166
);
170167
}
171168

172-
$cimo_data[ 'action' ] = $action_link;
169+
$cimo_data[ 'action' ] = html_entity_decode( $action_link );
173170

174171
add_filter( 'stackable_localize_script', function ( $args ) use( $cimo_data ) {
175172
return $this->add_localize_script( $args, 'cimo', $cimo_data );
@@ -286,6 +283,9 @@ function check_cimo_status() {
286283

287284
$full_slug = self::$PLUGINS[ $slug ][ 'full_slug' ];
288285

286+
// Clear plugin cache to ensure we get the most current status
287+
+ wp_clean_plugins_cache();
288+
289289
if ( $action === 'install' && ! self::is_plugin_installed( $full_slug ) ) {
290290
$response[ 'status' ] = 'installing';
291291
} else if ( ! self::is_plugin_activated( $full_slug ) ) {

0 commit comments

Comments
 (0)