Ticket #31002: 31002.1.diff

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

@@ -416 +416 @@
                                                 break;
                                         case 'latest_installed':
                                         case 'newer_installed':
-                                                $action_links[] = '<span class="button button-disabled" title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
+                                                $plugins = get_plugins( '/' . $plugin['slug'] );
+                                                if ( ! empty( $plugins ) ) {
+                                                        $keys = array_keys( $plugins );
+                                                        $plugin_file = $plugin['slug'] . '/' . $keys[0];
+                                                }
+                                                if ( ! is_plugin_active( $plugin_file ) ) {
+                                                        $args = array();
+                                                        if ( isset( $_REQUEST['tab'] ) ) {
+                                                                $args['tab'] = $_REQUEST['tab'];
+                                                        }
+                                                        if ( isset( $_REQUEST['s'] ) ) {
+                                                                $args['s'] = $_REQUEST['s'];
+                                                        }
+                                                        $action_links[] = '<a class="button" href="' . wp_nonce_url( add_query_arg( $args, 'plugins.php?action=activate&amp;plugin=' . $plugin_file . '&from=plugin-install' ), 'activate-plugin_' . $plugin_file ) . '" title="' . esc_attr__( 'Activate this plugin' ) . '" target="_parent">' . _x( 'Activate', 'plugin' ) . '</a>';
+                                                } else {
+                                                        $action_links[] = '<span class="button button-disabled" title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
+                                                }
                                                 break;
                                 }
                         }

src/wp-admin/plugins.php

@@ -56 +56 @@
 
                         if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
                                 wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
+                        } else if ( isset( $_GET['from'] ) && 'plugin-install' == $_GET['from'] ) {
+                                $args = array();
+                                if ( isset( $_REQUEST['tab'] ) ) {
+                                        $args['tab'] = $_REQUEST['tab'];
+                                }
+                                if ( ! empty( $s ) ) {
+                                        $args['s'] = $s;
+                                }
+                                wp_redirect( self_admin_url( add_query_arg( $args, "plugin-install.php" ) ) );
                         } else {
                                 wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
                         }