1 files changed, 21 insertions, 5 deletions
diff --git a/plugins/jetpack/3rd-party/vaultpress.php b/plugins/jetpack/3rd-party/vaultpress.php
index b1c1cfd7..17f47aeb 100644
--- a/plugins/jetpack/3rd-party/vaultpress.php
+++ b/plugins/jetpack/3rd-party/vaultpress.php
@@ -1,26 +1,42 @@
 <?php
 
+/**
+ * Notify user that VaultPress has been disabled. Hide VaultPress notice that requested attention.
+ *
+ * @since 5.8
+ */
 function jetpack_vaultpress_rewind_enabled_notice() {
-	$plugin_file = 'vaultpress/vaultpress.php';
+	// The deactivation is performed here because there may be pages that admin_init runs on,
+	// such as admin_ajax, that could deactivate the plugin without showing this notification.
+	deactivate_plugins( 'vaultpress/vaultpress.php' );
 
-	deactivate_plugins( $plugin_file );
+	// Remove WP core notice that says that the plugin was activated.
+	if ( isset( $_GET['activate'] ) ) {
+		unset( $_GET['activate'] );
+	}
 	?>
 	<div class="notice notice-success vp-deactivated">
 		<h2 style="margin-bottom: 0.25em;"><?php _e( 'Jetpack is now handling your backups.', 'jetpack' ); ?></h2>
 		<p><?php _e( 'VaultPress is no longer needed and has been deactivated.', 'jetpack' ); ?></p>
 	</div>
+	<style>#vp-notice{display:none;}</style>
 	<?php
 }
 
-// If Rewind is enabled, then show a notification to disable VaultPress.
+/**
+ * If Rewind is enabled, remove its entry in sidebar, deactivate VaultPress, and show a notification.
+ *
+ * @since 5.8
+ */
 function jetpack_vaultpress_rewind_check() {
 	if ( Jetpack::is_active() &&
 		 Jetpack::is_plugin_active( 'vaultpress/vaultpress.php' ) &&
 		 Jetpack::is_rewind_enabled()
 		) {
+		remove_submenu_page( 'jetpack', 'vaultpress' );
+
 		add_action( 'admin_notices', 'jetpack_vaultpress_rewind_enabled_notice' );
 	}
 }
 
-
-add_action( 'admin_init', 'jetpack_vaultpress_rewind_check', 11 );
-\ No newline at end of file
+add_action( 'admin_init', 'jetpack_vaultpress_rewind_check', 11 );