From 98b042e189d2d223de00e4e23a88568d0ae026f0 Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Thu, 29 Nov 2018 08:30:46 +0000
Subject: [PATCH] Help/About: Do not show the "Keep it Classic" section and the
 link to it at the top when the Classic Editor plugin is already installed.

See #45178.
Built from https://develop.svn.wordpress.org/branches/5.0@43947


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

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 89f1b3cdad..22ec200fa0 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -45,7 +45,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				);
 				?>
 			</div>
-		<?php else : ?>
+		<?php elseif ( ! file_exists( WP_PLUGIN_DIR . '/classic-editor/classic-editor.php' ) ) : ?>
 			<p class="about-text">
 				<a href="#classic-editor"><?php _e( 'Learn how to keep using the old editor.' ); ?></a>
 			</p>
@@ -317,30 +317,32 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 		<hr />
 
-		<div class="feature-section one-col" id="classic-editor">
-			<div class="col">
-				<h2><?php _e( 'Keep it Classic' ); ?></h2>
+		<?php if ( ! file_exists( WP_PLUGIN_DIR . '/classic-editor/classic-editor.php' ) ) : ?>
+			<div class="feature-section one-col" id="classic-editor">
+				<div class="col">
+					<h2><?php _e( 'Keep it Classic' ); ?></h2>
+				</div>
 			</div>
-		</div>
 
-		<div class="full-width">
-			<img src="https://wordpress.org/gutenberg/files/2018/11/Classic-2.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>
-				<p><?php _e( 'The Classic Editor plugin restores the previous WordPress editor and the Edit Post screen. It lets you keep using plugins that extend it, add old-style meta boxes, or otherwise depend on the previous editor. To install, visit your plugins page and click the “Install Now” button next to “Classic Editor.” After the plugin finishes installing, click “Activate.” That’s it! ' ); ?></p>
-				<p><?php _e( 'Note to users of assistive technology: if you experience usability issues with the block editor, we recommend you continue to use the Classic Editor.' ); ?></p>
-				<?php if ( current_user_can( 'install_plugins' ) ) { ?>
-					<div class="col cta">
-						<a class="button button-primary button-hero" href="<?php echo esc_url( wp_nonce_url( self_admin_url( 'plugin-install.php?tab=favorites&user=wordpressdotorg' ), 'save_wporg_username_' . get_current_user_id() ) ); ?>"><?php _e( 'Install the Classic Editor' ); ?></a>
-					</div>
-				<?php } ?>
+			<div class="full-width">
+				<img src="https://wordpress.org/gutenberg/files/2018/11/Classic-2.png" alt="">
 			</div>
-		</div>
 
-		<hr />
+			<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>
+					<p><?php _e( 'The Classic Editor plugin restores the previous WordPress editor and the Edit Post screen. It lets you keep using plugins that extend it, add old-style meta boxes, or otherwise depend on the previous editor. To install, visit your plugins page and click the &#8220;Install Now&#8221; button next to &#8220;Classic Editor&#8221;. After the plugin finishes installing, click &#8220;Activate&#8221;. That’s it!' ); ?></p>
+					<p><?php _e( 'Note to users of assistive technology: if you experience usability issues with the block editor, we recommend you continue to use the Classic Editor.' ); ?></p>
+					<?php if ( current_user_can( 'install_plugins' ) ) { ?>
+						<div class="col cta">
+							<a class="button button-primary button-hero" href="<?php echo esc_url( wp_nonce_url( self_admin_url( 'plugin-install.php?tab=favorites&user=wordpressdotorg' ), 'save_wporg_username_' . get_current_user_id() ) ); ?>"><?php _e( 'Install the Classic Editor' ); ?></a>
+						</div>
+					<?php } ?>
+				</div>
+			</div>
+
+			<hr />
+		<?php endif; ?>
 
 		<div class="return-to-dashboard">
 			<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 142515f339..629b2768a9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-RC1-43946';
+$wp_version = '5.0-RC1-43947';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.