Index: trunk/src/wp-admin/includes/class-plugin-upgrader-skin.php
===================================================================
--- trunk/src/wp-admin/includes/class-plugin-upgrader-skin.php (revision 41290)
+++ trunk/src/wp-admin/includes/class-plugin-upgrader-skin.php (revision 42343)
@@ -17,22 +17,26 @@
*/
class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
- public $plugin = '';
- public $plugin_active = false;
+ public $plugin = '';
+ public $plugin_active = false;
public $plugin_network_active = false;
/**
- *
* @param array $args
*/
public function __construct( $args = array() ) {
- $defaults = array( 'url' => '', 'plugin' => '', 'nonce' => '', 'title' => __('Update Plugin') );
- $args = wp_parse_args($args, $defaults);
+ $defaults = array(
+ 'url' => '',
+ 'plugin' => '',
+ 'nonce' => '',
+ 'title' => __( 'Update Plugin' ),
+ );
+ $args = wp_parse_args( $args, $defaults );
$this->plugin = $args['plugin'];
- $this->plugin_active = is_plugin_active( $this->plugin );
+ $this->plugin_active = is_plugin_active( $this->plugin );
$this->plugin_network_active = is_plugin_active_for_network( $this->plugin );
- parent::__construct($args);
+ parent::__construct( $args );
}
@@ -41,5 +45,5 @@
public function after() {
$this->plugin = $this->upgrader->plugin_info();
- if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){
+ if ( ! empty( $this->plugin ) && ! is_wp_error( $this->result ) && $this->plugin_active ) {
// Currently used only when JS is off for a single plugin update?
echo '';
@@ -48,10 +52,11 @@
$this->decrement_update_count( 'plugin' );
- $update_actions = array(
- 'activate_plugin' => '' . __( 'Activate Plugin' ) . '',
- 'plugins_page' => '' . __( 'Return to Plugins page' ) . ''
+ $update_actions = array(
+ 'activate_plugin' => '' . __( 'Activate Plugin' ) . '',
+ 'plugins_page' => '' . __( 'Return to Plugins page' ) . '',
);
- if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugin', $this->plugin ) )
+ if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugin', $this->plugin ) ) {
unset( $update_actions['activate_plugin'] );
+ }
/**
@@ -65,6 +70,7 @@
$update_actions = apply_filters( 'update_plugin_complete_actions', $update_actions, $this->plugin );
- if ( ! empty($update_actions) )
- $this->feedback(implode(' | ', (array)$update_actions));
+ if ( ! empty( $update_actions ) ) {
+ $this->feedback( implode( ' | ', (array) $update_actions ) );
+ }
}
}