mirror of
https://github.com/WordPress/WordPress.git
synced 2024-12-24 01:57:53 +01:00
Remove activate/deactivate messages from plugin upgrades. Props toppa. fixes #17833
git-svn-id: http://core.svn.wordpress.org/trunk@20786 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
5729685cb7
commit
28d2b205d8
@ -374,7 +374,6 @@ class Plugin_Upgrader extends WP_Upgrader {
|
|||||||
$this->strings['no_package'] = __('Update package not available.');
|
$this->strings['no_package'] = __('Update package not available.');
|
||||||
$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>…');
|
$this->strings['downloading_package'] = __('Downloading update from <span class="code">%s</span>…');
|
||||||
$this->strings['unpack_package'] = __('Unpacking the update…');
|
$this->strings['unpack_package'] = __('Unpacking the update…');
|
||||||
$this->strings['deactivate_plugin'] = __('Deactivating the plugin…');
|
|
||||||
$this->strings['remove_old'] = __('Removing the old version of the plugin…');
|
$this->strings['remove_old'] = __('Removing the old version of the plugin…');
|
||||||
$this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
|
$this->strings['remove_old_failed'] = __('Could not remove the old plugin.');
|
||||||
$this->strings['process_failed'] = __('Plugin update failed.');
|
$this->strings['process_failed'] = __('Plugin update failed.');
|
||||||
@ -597,7 +596,6 @@ class Plugin_Upgrader extends WP_Upgrader {
|
|||||||
return new WP_Error('bad_request', $this->strings['bad_request']);
|
return new WP_Error('bad_request', $this->strings['bad_request']);
|
||||||
|
|
||||||
if ( is_plugin_active($plugin) ) {
|
if ( is_plugin_active($plugin) ) {
|
||||||
$this->skin->feedback('deactivate_plugin');
|
|
||||||
//Deactivate the plugin silently, Prevent deactivation hooks from running.
|
//Deactivate the plugin silently, Prevent deactivation hooks from running.
|
||||||
deactivate_plugins($plugin, true);
|
deactivate_plugins($plugin, true);
|
||||||
}
|
}
|
||||||
@ -1198,7 +1196,6 @@ class Plugin_Upgrader_Skin extends WP_Upgrader_Skin {
|
|||||||
function after() {
|
function after() {
|
||||||
$this->plugin = $this->upgrader->plugin_info();
|
$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 ){
|
||||||
show_message(__('Reactivating the plugin…'));
|
|
||||||
echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
|
echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . $this->plugin, 'activate-plugin_' . $this->plugin) .'"></iframe>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user