| @@ -76,15 +76,14 @@ | ||
| 76 | 76 | |
| 77 | 77 | $_inactive_plugins = []; |
| 78 | 78 | $_plugins = Helper::get_plugins(); |
| 79 | 79 | |
| 80 | - if( $platform === 'elementor' ) { | |
| 80 | + if( ! Helper::is_plugin_active( 'elementor/elementor.php' ) && $platform === 'elementor' ) { | |
| 81 | 81 | $elementor_plugin = new stdClass(); |
| 82 | 82 | $elementor_plugin->name = __( 'Elementor', 'templately' ); |
| 83 | 83 | $elementor_plugin->plugin_file = 'elementor/elementor.php'; |
| 84 | 84 | $elementor_plugin->slug = 'elementor'; |
| 85 | 85 | $elementor_plugin->is_pro = false; |
| 86 | - $elementor_plugin->is_active = Helper::is_plugin_active( 'elementor/elementor.php' ); | |
| 87 | 86 | |
| 88 | 87 | $_inactive_plugins[] = $elementor_plugin; |
| 89 | 88 | } |
| 90 | 89 | |
| @@ -94,13 +93,11 @@ | ||
| 94 | 93 | continue; |
| 95 | 94 | } |
| 96 | 95 | |
| 97 | 96 | $dependency = ( object ) $dependency; |
| 98 | - if ( is_null( $dependency->plugin_file ) ) { | |
| 97 | + if ( is_null( $dependency->plugin_file ) || Helper::is_plugin_active( $dependency->plugin_file ) ) { | |
| 99 | 98 | continue; |
| 100 | 99 | } |
| 101 | - | |
| 102 | - $dependency->is_active = Helper::is_plugin_active( $dependency->plugin_file ); | |
| 103 | 100 | |
| 104 | 101 | if( isset( $dependency->plugin_original_slug ) ) { |
| 105 | 102 | $dependency->slug = $dependency->plugin_original_slug; |
| 106 | 103 | unset( $dependency->plugin_original_slug ); |