From 0d5fd392e8d4947a4a76fd5997c98a794346b744 Mon Sep 17 00:00:00 2001
From: mcsf <mcsf@git.wordpress.org>
Date: Wed, 21 Nov 2018 16:35:48 +0000
Subject: [PATCH] Warn users of Gutenberg plugin of its deactivation upon 5.0
 upgrade.

Fixes #45073.


Built from https://develop.svn.wordpress.org/branches/5.0@43921


git-svn-id: http://core.svn.wordpress.org/branches/5.0@43753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php            | 44 ++++++++++++++++++++++++-----------
 wp-admin/includes/upgrade.php |  7 ++++++
 wp-includes/version.php       |  2 +-
 3 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 1edcc9903c..021a2d355f 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -24,9 +24,25 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>
 
 		<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s introduces a robust new content creation experience.' ), $display_version ); ?></p>
-		<p class="about-text">
-			<a href="#classic-editor"><?php _e( 'Learn how to keep using the old editor.' ); ?></a>
-		</p>
+
+		<?php if (
+			// Was the Gutenberg plugin installed before upgrading to 5.0.x?
+			get_option( 'upgrade_500_was_gutenberg_active' ) == '1'  &&
+			current_user_can( 'activate_plugins' ) &&
+			// Has it not been reactivated since?
+			is_plugin_inactive( 'gutenberg/gutenberg.php' ) &&
+			// Is it still installed?
+			file_exists( WP_PLUGIN_DIR . '/gutenberg/gutenberg.php' )
+		) : ?>
+			<div class="about-text" style="font-style:italic;">
+				<?php printf( __( 'The Gutenberg plugin has been deactivated, as the features are now included in WordPress %1$s by default. If you&#8217;d like to continue to test the upcoming changes in the WordPress editing experience, please %2$sreactivate the Gutenberg plugin%3$s.' ), $display_version, '<a href="' . esc_url( self_admin_url( 'plugins.php?s=gutenberg&plugin_status=all' ) ) . '">', '</a>' ); ?>
+			</div>
+		<?php else : ?>
+			<p class="about-text">
+				<a href="#classic-editor"><?php _e( 'Learn how to keep using the old editor.' ); ?></a>
+			</p>
+		<?php endif; ?>
+
 		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
 		<h2 class="nav-tab-wrapper wp-clearfix">
@@ -202,13 +218,13 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				</video>
 			</div>
 		</div>
-		
+
 		<div class="feature-section one-col cta">
 			<div class="col">
-				<a class="button button-primary button-hero" href="<?php echo esc_url( admin_url( 'post-new.php' ) ); ?>"><?php _e( 'Build your first post' ); ?></a>	
+				<a class="button button-primary button-hero" href="<?php echo esc_url( admin_url( 'post-new.php' ) ); ?>"><?php _e( 'Build your first post' ); ?></a>
 			</div>
 		</div>
-		
+
 		<hr />
 
 		<div class="feature-section one-col">
@@ -250,12 +266,12 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 		<div class="feature-section one-col cta">
 			<div class="col">
-				<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo esc_url( admin_url( 'customize.php?theme=twentynineteen' ) ); ?>"><?php _e( 'Give Twenty Nineteen a try' ); ?></a>	
+				<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo esc_url( admin_url( 'customize.php?theme=twentynineteen' ) ); ?>"><?php _e( 'Give Twenty Nineteen a try' ); ?></a>
 			</div>
 		</div>
 
 		<hr />
-			
+
 		<div class="under-the-hood feature-section">
 			<div class="col">
 				<h2><?php _e( 'Developer Happiness' ); ?></h2>
@@ -276,25 +292,25 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				<p><?php _e( 'The new block paradigm opens up a path of exploration and imagination when it comes to solving user needs. With the unified block insertion flow, it&#8217;s easier for your clients and customers to find and use blocks for all types of content. Developers can focus on executing their vision and providing rich editing experiences, rather than fussing with difficult APIs.' ); ?></p>
 			</div>
 		</div>
-		
+
 		<div class="under-the-hood feature-section one-col cta">
 			<div class="col">
-				<a class="button button-primary button-hero" href="<?php echo esc_url( 'https://wordpress.org/gutenberg/handbook/' ); ?>"><?php _e( 'Learn how to get started' ); ?></a>	
+				<a class="button button-primary button-hero" href="<?php echo esc_url( 'https://wordpress.org/gutenberg/handbook/' ); ?>"><?php _e( 'Learn how to get started' ); ?></a>
 			</div>
 		</div>
 
 		<hr />
-		
+
 		<div class="feature-section one-col" id="classic-editor">
 			<div class="col">
 				<h2><?php _e( 'Keep it Classic' ); ?></h2>
 			</div>
 		</div>
-		
+
 		<div class="full-width">
 			<img src="https://wordpress.org/gutenberg/files/2018/11/classic.png" alt="">
 		</div>
-		
+
 		<div class="feature-section one-col">
 			<div class="col">
 				<p><?php _e( 'Prefer to stick with the familiar Classic Editor? No problem! Support for the Classic Editor plugin will remain in WordPress until 2021.' ); ?></p>
@@ -305,7 +321,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				</div>
 			</div>
 		</div>
-		
+
 		<hr />
 
 		<div class="return-to-dashboard">
diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php
index 92ef9b9559..9dab2e9cdb 100644
--- a/wp-admin/includes/upgrade.php
+++ b/wp-admin/includes/upgrade.php
@@ -1824,6 +1824,13 @@ function upgrade_500() {
 		if ( defined( 'GUTENBERG_USE_PLUGIN' ) && GUTENBERG_USE_PLUGIN ) {
 			return;
 		}
+
+ 		$was_active = is_plugin_active( 'gutenberg/gutenberg.php' );
+ 		if ( $was_active ) {
+ 			// FIXME: Leave until 501 or 510 to clean up.
+ 			update_site_option( 'upgrade_500_was_gutenberg_active', '1' );
+ 		}
+
 		deactivate_plugins( array( 'gutenberg/gutenberg.php' ), true );
 	}
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index a0fd0a70bc..bf0a6442f6 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-beta5-43920';
+$wp_version = '5.0-beta5-43921';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.