Ticket #20983: 20983.patch

src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -237 +237 @@
                 $actions = array();
 
                 if ( 'active' != $status )
-                        $actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
+                        $actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Activate for all sites' ) : __( 'Activate' );
 
                 if ( 'inactive' != $status && 'recent' != $status )
-                        $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
+                        $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Deactivate for all sites' ) : __( 'Deactivate' );
 
                 if ( !is_multisite() || $this->screen->in_admin( 'network' ) ) {
                         if ( current_user_can( 'update_plugins' ) )
@@ -339 +339 @@
                         if ( $screen->in_admin( 'network' ) ) {
                                 if ( $is_active ) {
                                         if ( current_user_can( 'manage_network_plugins' ) )
-                                                $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
+                                                $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Deactivate for all sites') . '</a>';
                                 } else {
                                         if ( current_user_can( 'manage_network_plugins' ) )
-                                                $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
+                                                $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Activate for all sites') . '</a>';
                                         if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) )
                                                 $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
                                 }

src/wp-admin/includes/class-wp-upgrader-skins.php

@@ -371 +371 @@
                         $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>';
 
                 if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-                        $install_actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" target="_parent">' . __('Network Activate') . '</a>';
+                        $install_actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" target="_parent">' . __('Activate for all sites') . '</a>';
                         unset( $install_actions['activate_plugin'] );
                 }
 
@@ -531 +531 @@
 /**
  * Upgrader Skin for Automatic WordPress Upgrades
  *
- * This skin is designed to be used when no output is intended, all output 
+ * This skin is designed to be used when no output is intended, all output
  * is captured and stored for the caller to process and log/email/discard.
  *
  * @package WordPress
@@ -608 +608 @@
         function bulk_footer() {}
         function before() {}
         function after() {}
-}
- No newline at end of file
+}