Changeset 38172 for trunk/src/wp-admin/plugin-install.php

Timestamp:

07/31/2016 06:10:45 PM (9 years ago)

Author:

ocean90

Message:

Plugins: Use install_plugins_upload action to print the upload form.

Since [37221] the upload form is added to every plugin install screen via install_plugins_upload(). Previously the form was added through the install_plugins_upload (alias of install_plugins_$tab) action which allowed plugin authors to replace the form. This restores the previous behaviour.

• Add the form only to non-upload plugin install screens.
• Replace install_plugins_upload() with the install_plugins_upload and install_plugins_pre_upload actions.
• Remove $upload_tab_class and add a CSS class for the current tab to .wrap
• Adjust CSS selectors and toggle the whole container to support upload without an upload-plugin class.

Props DavidAnderson, ocean90.
Fixes #37495.

File:

• trunk/src/wp-admin/plugin-install.php (modified) (3 diffs)

trunk/src/wp-admin/plugin-install.php

@@ -67 +67 @@
 do_action( "install_plugins_pre_$tab" );
 
+/*
+ * Call the pre upload action on every non-upload plugin install screen
+ * because the form is always displayed on these screens.
+ */
+if ( 'upload' !== $tab ) {
+    /** This action is documented in wp-admin/plugin-install.php */
+    do_action( 'install_plugins_pre_upload' );
+}
+
 get_current_screen()->add_help_tab( array(
 'id'        => 'overview',
@@ -102 +111 @@
 include(ABSPATH . 'wp-admin/admin-header.php');
 ?>
-<div class="wrap">
+<div class="wrap <?php echo esc_attr( "plugin-install-tab-$tab" ); ?>">
 <h1>
     <?php
     echo esc_html( $title );
     if ( ! empty( $tabs['upload'] ) && current_user_can( 'upload_plugins' ) ) {
-        if ( $tab === 'upload' ) {
-            $href = self_admin_url( 'plugin-install.php' );
-            $upload_tab_class = ' upload-tab';
-        } else {
-            $href = self_admin_url( 'plugin-install.php?tab=upload' );
-            $upload_tab_class = '';
-        }
-
-        printf( ' <a href="%s" class="upload-view-toggle page-title-action%s"><span class="upload">%s</span><span class="browse">%s</span></a>',
-            $href,
-            $upload_tab_class,
+        printf( ' <a href="%s" class="upload-view-toggle page-title-action"><span class="upload">%s</span><span class="browse">%s</span></a>',
+            ( 'upload' === $tab ) ? self_admin_url( 'plugin-install.php' ) : self_admin_url( 'plugin-install.php?tab=upload' ),
             __( 'Upload Plugin' ),
             __( 'Browse Plugins' )
@@ -125 +125 @@
 </h1>
 
-<div class="upload-plugin-wrap<?php echo $upload_tab_class; ?>">
 <?php
 /*
- * Output the upload plugin form on every plugin install screen, so it can be
+ * Output the upload plugin form on every non-upload plugin install screen, so it can be
  * displayed via JavaScript rather then opening up the devoted upload plugin page.
  */
-install_plugins_upload(); ?>
-</div>
+if ( $tab !== 'upload' ) {
+    ?>
+    <div class="upload-plugin-wrap">
+        <?php
+        /** This action is documented in wp-admin/plugin-install.php */
+        do_action( 'install_plugins_upload' );
+        ?>
+    </div>
+    <?php
+}
 
-<?php
 if ( $tab !== 'upload' ) {
     $wp_list_table->views();