Changeset 29637

Timestamp:

08/27/2014 02:58:46 AM (12 years ago)

Author:

nacin

Message:

Adjust [29634] so the Upload Plugin button can be shown. see #29236.

File:

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

trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -71 +71 @@
                 if ( current_user_can( 'upload_plugins' ) ) {
                         // No longer a real tab. Here for filter compatibility.
-                        // Gets juggled into $nonmenu_tabs below.
+                        // Gets skipped in get_views().
                         $tabs['upload'] = __( 'Upload Plugin' );
                 }
@@ -95 +95 @@
                  */
                 $nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
-
-                if ( isset( $tabs['upload'] ) ) {
-                        unset( $tabs['upload'] );
-                        $nonmenu_tabs[] = 'upload';
-                }
 
                 // If a non-valid menu tab has been selected, And it's not a non-menu action.
@@ -216 +211 @@
                         $display_tabs['plugin-install-'.$action] = "<a href='$href' class='$class'>$text</a>";
                 }
+                // No longer a real tab.
+                unset( $display_tabs['plugin-install-upload'] );
 
                 return $display_tabs;