Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adjust the TGM_Bulk_Installer_Skin class to be able to deal with upgr…
…ades. Most significant changes: - add install_type as part of the arguments passed so we know whether we are dealing with a bulk install or bulk update - Both the `before()` and `after()` methods were copies of the original with only the a different title. As we can set the title as an optional argument, there was no need to copy the code, so largely simplified the overloaded methods. - Updated the `bulk_footer()` method to be in line with the way things are done in the base class - Deprecated two unnecessary methods
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2530,8 +2530,10 @@ function tgmpa_load_bulk_installer() { | |
| // Get TGMPA class instance | ||
| $tgmpa_instance = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) ); | ||
|
|
||
| if ( isset( $_GET['page'] ) && $tgmpa_instance->menu === $_GET['page'] ) { | ||
| if ( ! class_exists( 'WP_Upgrader', false ) ) { | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
jrfnl
Author
Contributor
|
||
| require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; | ||
| } | ||
|
|
||
| if ( ! class_exists( 'TGM_Bulk_Installer' ) ) { | ||
| /** | ||
|
|
@@ -2868,6 +2870,8 @@ public function auto_activate( $bool, $hook_extra, $result ) { | |
| * | ||
| * @since 2.2.0 | ||
| * | ||
| * @see https://core.trac.wordpress.org/browser/trunk/src/wp-admin/includes/class-wp-upgrader-skins.php | ||
| * | ||
| * @package TGM-Plugin-Activation | ||
| * @author Thomas Griffin | ||
| * @author Gary Jones | ||
|
|
@@ -2922,7 +2926,12 @@ public function __construct( $args = array() ) { | |
| $this->tgmpa = call_user_func( array( get_class( $GLOBALS['tgmpa'] ), 'get_instance' ) ); | ||
|
|
||
| // Parse default and new args. | ||
| $defaults = array( | ||
| 'url' => '', | ||
| 'nonce' => '', | ||
| 'names' => array(), | ||
| 'install_type' => 'install', | ||
| ); | ||
| $args = wp_parse_args( $args, $defaults ); | ||
|
|
||
| // Set plugin names to $this->plugin_names property. | ||
|
|
@@ -2942,25 +2951,30 @@ public function __construct( $args = array() ) { | |
| * @since 2.2.0 | ||
| */ | ||
| public function add_strings() { | ||
| if ( 'update' === $this->options['install_type'] ) { | ||
| parent::add_strings(); | ||
| $this->upgrader->strings['skin_before_update_header'] = __( 'Updating Plugin %1$s (%2$d/%3$d)', 'tgmpa' ); | ||
|
|
||
| } else { | ||
|
|
||
| $this->upgrader->strings['skin_update_failed_error'] = __( 'An error occurred while installing %1$s: <strong>%2$s</strong>.', 'tgmpa' ); | ||
| $this->upgrader->strings['skin_update_failed'] = __( 'The installation of %1$s failed.', 'tgmpa' ); | ||
|
|
||
| // Automatic activation strings. | ||
| if ( $this->tgmpa->is_automatic ) { | ||
| $this->upgrader->strings['skin_upgrade_start'] = __( 'The installation and activation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa' ); | ||
| $this->upgrader->strings['skin_update_successful'] = __( '%1$s installed and activated successfully.', 'tgmpa' ) . ' <a href="#" class="hide-if-no-js" onclick="%2$s"><span>' . esc_html__( 'Show Details', 'tgmpa' ) . '</span><span class="hidden">' . esc_html__( 'Hide Details', 'tgmpa' ) . '</span>.</a>'; | ||
| $this->upgrader->strings['skin_upgrade_end'] = __( 'All installations and activations have been completed.', 'tgmpa' ); | ||
| $this->upgrader->strings['skin_before_update_header'] = __( 'Installing and Activating Plugin %1$s (%2$d/%3$d)', 'tgmpa' ); | ||
| } | ||
| // Default installation strings. | ||
| else { | ||
| $this->upgrader->strings['skin_upgrade_start'] = __( 'The installation process is starting. This process may take a while on some hosts, so please be patient.', 'tgmpa' ); | ||
| $this->upgrader->strings['skin_update_successful'] = esc_html__( '%1$s installed successfully.', 'tgmpa' ) . ' <a href="#" class="hide-if-no-js" onclick="%2$s"><span>' . esc_html__( 'Show Details', 'tgmpa' ) . '</span><span class="hidden">' . esc_html__( 'Hide Details', 'tgmpa' ) . '</span>.</a>'; | ||
| $this->upgrader->strings['skin_upgrade_end'] = __( 'All installations have been completed.', 'tgmpa' ); | ||
| $this->upgrader->strings['skin_before_update_header'] = __( 'Installing Plugin %1$s (%2$d/%3$d)', 'tgmpa' ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -2971,24 +2985,10 @@ public function add_strings() { | |
| * @param string $title Unused in this implementation. | ||
| */ | ||
| public function before( $title = '' ) { | ||
| if ( empty( $title ) ) { | ||
| $title = esc_html( $this->plugin_names[ $this->i ] ); | ||
| } | ||
| parent::before( $title ); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -3002,38 +3002,12 @@ public function before( $title = '' ) { | |
| * @param string $title Unused in this implementation. | ||
| */ | ||
| public function after( $title = '' ) { | ||
| if ( empty( $title ) ) { | ||
| $title = esc_html( $this->plugin_names[ $this->i ] ); | ||
| } | ||
| parent::after( $title ); | ||
|
|
||
| $this->i++; | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -3050,49 +3024,62 @@ public function bulk_footer() { | |
| wp_clean_plugins_cache(); | ||
|
|
||
| // Display message based on if all plugins are now active or not. | ||
| $update_actions = array(); | ||
|
|
||
| if ( $this->tgmpa->tgmpa_complete() ) { | ||
| // All plugins are active, so we display the complete string and hide the menu to protect users. | ||
| echo '<style type="text/css">#adminmenu .wp-submenu li.current { display: none !important; }</style>'; | ||
| $update_actions['dashboard'] = sprintf( | ||
| esc_html( $this->tgmpa->strings['complete'] ), | ||
| '<a href="' . esc_url( self_admin_url() ) . '">' . esc_html__( 'Return to the Dashboard', 'tgmpa' ) . '</a>' | ||
| ); | ||
| } else { | ||
| $update_actions['tgmpa_page'] = '<a href="' . esc_url( $this->tgmpa->get_tgmpa_url() ) . '" target="_parent">' . esc_html( $this->tgmpa->strings['return'] ) . '</a>'; | ||
| } | ||
|
|
||
| /** | ||
| * Filter the list of action links available following bulk plugin updates. | ||
| * | ||
| * @since 2.5.0 | ||
| * | ||
| * @param array $update_actions Array of plugin action links. | ||
| * @param array $plugin_info Array of information for the last-updated plugin. | ||
| */ | ||
| $update_actions = apply_filters( 'tgmpa_update_bulk_plugins_complete_actions', $update_actions, $this->plugin_info ); | ||
|
|
||
| if ( ! empty( $update_actions ) ) { | ||
| $this->feedback( implode( ' | ', (array) $update_actions ) ); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| // *********** DEPRECATED METHODS *********** // | ||
|
|
||
| /** | ||
| * Flush header output buffer. | ||
| * | ||
| * @since 2.2.0 | ||
| * @deprecated 2.5.0 | ||
| * @see Bulk_Upgrader_Skin::flush_output() | ||
| */ | ||
| public function before_flush_output() { | ||
| _deprecated_function( __FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()' ); | ||
| parent::flush_output(); | ||
| } | ||
|
|
||
| /** | ||
| * Flush footer output buffer and iterate $this->i to make sure the | ||
| * installation strings reference the correct plugin. | ||
| * | ||
| * @since 2.2.0 | ||
| * @deprecated 2.5.0 | ||
| * @see Bulk_Upgrader_Skin::flush_output() | ||
| */ | ||
| public function after_flush_output() { | ||
| _deprecated_function( __FUNCTION__, 'TGMPA 2.5.0', 'Bulk_Upgrader_Skin::flush_output()' ); | ||
| parent::flush_output(); | ||
| $this->i++; | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
Although probably the same file, should this be checking for Plugin_Upgrader instead of WP_Upgrader?