Ticket #41316: 41316.19.diff

src/wp-admin/css/dashboard.css

@@ -127 +127 @@
 .try-gutenberg-panel h3 {
         margin: 17px 0 0;
         font-size: 16px;
+        line-height: 1.4em;
 }
 
 .welcome-panel li,

src/wp-admin/includes/dashboard.php

@@ -1632 +1632 @@
 
         if ( current_user_can( 'install_plugins' ) ) {
                 if ( empty( $plugins['gutenberg/gutenberg.php'] ) ) {
-                        $action = __( 'Install Gutenberg' );
-                        $url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=gutenberg' ), 'install-plugin_gutenberg' );
-                        $classes = ' install-now';
+                        if ( get_filesystem_method( array(), WP_PLUGIN_DIR ) === 'direct' ) {
+                                $action = __( 'Install Gutenberg' );
+                                $url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=gutenberg' ), 'install-plugin_gutenberg' );
+                                $classes = ' install-now';
+                        }
                 } else if ( is_plugin_inactive( 'gutenberg/gutenberg.php' ) ) {
                         $action = __( 'Activate Gutenberg' );
                         $url = wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=gutenberg/gutenberg.php&from=try-gutenberg' ), 'activate-plugin_gutenberg/gutenberg.php' );
@@ -1642 +1644 @@
                 }
 
                 if ( empty( $plugins['classic-editor/classic-editor.php'] ) ) {
-                        $classic_action = __( 'Install the Classic Editor' );
-                        $classic_url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=classic-editor' ), 'install-plugin_classic-editor' );
-                        $classic_classes = ' install-now';
+                        if ( get_filesystem_method( array(), WP_PLUGIN_DIR ) === 'direct' ) {
+                                $classic_action = __( 'Install the Classic Editor' );
+                                $classic_url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=classic-editor' ), 'install-plugin_classic-editor' );
+                                $classic_classes = ' install-now';
+                        }
                 } else if ( is_plugin_inactive( 'classic-editor/classic-editor.php' ) ) {
                         $classic_action = __( 'Activate the Classic Editor' );
                         $classic_url = wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=classic-editor/classic-editor.php&from=try-gutenberg' ), 'activate-plugin_classic-editor/classic-editor.php' );
@@ -1695 +1699 @@
                                         </p>
                                 </div>
 
+                                <div class="try-gutenberg-action">
                                         <?php if ( $action ) { ?>
-                                                <div class="try-gutenberg-action">
-                                                        <p><a class="button button-primary button-hero<?php echo $classes; ?>" href="<?php echo esc_url( $url ); ?>" data-name="<?php esc_attr_e( 'Gutenberg' ); ?>" data-slug="gutenberg"><?php echo $action; ?></a></p>
-                                                        <p>
-                                                                <?php
-                                                                        printf(
-                                                                                /* translators: Link to https://wordpress.org/gutenberg/ */
-                                                                                __( '<a href="%s">Learn more about Gutenberg</a>' ),
-                                                                                __( 'https://wordpress.org/gutenberg/' )
-                                                                        );
-                                                                ?>
-                                                        </p>
-                                                </div>
+                                                <p><a class="button button-primary button-hero<?php echo $classes; ?>" href="<?php echo esc_url( $url ); ?>" data-name="<?php esc_attr_e( 'Gutenberg' ); ?>" data-slug="gutenberg"><?php echo $action; ?></a></p>
                                         <?php } ?>
+
+                                        <p>
+                                                <?php
+                                                        printf(
+                                                                /* translators: Link to https://wordpress.org/gutenberg/ */
+                                                                __( '<a href="%s">Learn more about Gutenberg</a>' ),
+                                                                __( 'https://wordpress.org/gutenberg/' )
+                                                        );
+                                                ?>
+                                        </p>
+
+                                        <?php
+                                                /**
+                                                 * This action fires after the "Install Gutenberg" button is displayed.
+                                                 *
+                                                 * It allows hosts or site owners to add links to extra information about
+                                                 * Gutenberg, specific to their service.
+                                                 *
+                                                 * WARNING: This action will only exist in the 4.9.x series, it will not be
+                                                 * added to WordPress 5.0 and later.
+                                                 *
+                                                 * @since 4.9.8
+                                                 */
+                                                do_action( 'try_gutenberg_after_install_button' );
+                                        ?>
+                                </div>
                         </div>
 
                         <div class="try-gutenberg-panel-column plugin-card-classic-editor">