mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-06-28 14:20:15 +00:00
Deactivate plugins during plugin update. Props DD32. see #6262
git-svn-id: https://develop.svn.wordpress.org/trunk@7465 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -86,7 +86,7 @@ function show_message($message) {
|
||||
else
|
||||
$message = $message->get_error_message();
|
||||
}
|
||||
echo "<p>$message</p>";
|
||||
echo "<p>$message</p>\n";
|
||||
}
|
||||
|
||||
function do_plugin_upgrade($plugin) {
|
||||
@@ -95,12 +95,12 @@ function do_plugin_upgrade($plugin) {
|
||||
$url = wp_nonce_url("update.php?action=upgrade-plugin&plugin=$plugin", "upgrade-plugin_$plugin");
|
||||
if ( false === ($credentials = request_filesystem_credentials($url)) )
|
||||
return;
|
||||
|
||||
if( ! WP_Filesystem($credentials) ){
|
||||
|
||||
if ( ! WP_Filesystem($credentials) ) {
|
||||
request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
echo '<div class="wrap">';
|
||||
echo '<h2>' . __('Upgrade Plugin') . '</h2>';
|
||||
if ( $wp_filesystem->errors->get_error_code() ) {
|
||||
@@ -110,18 +110,25 @@ function do_plugin_upgrade($plugin) {
|
||||
return;
|
||||
}
|
||||
|
||||
$was_activated = is_plugin_active($plugin); //Check now, It'll be deactivated by the next line if it is,
|
||||
|
||||
$result = wp_update_plugin($plugin, 'show_message');
|
||||
|
||||
if ( is_wp_error($result) )
|
||||
if ( is_wp_error($result) ) {
|
||||
show_message($result);
|
||||
else
|
||||
echo __('Plugin upgraded successfully');
|
||||
} else {
|
||||
//Result is the new plugin file relative to PLUGINDIR
|
||||
show_message(__('Plugin upgraded successfully'));
|
||||
if( $result && $was_activated ){
|
||||
show_message(__('Attempting reactivation of the plugin'));
|
||||
echo '<iframe style="border:0" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&plugin=' . $result, 'activate-plugin_' . $result) .'"></iframe>';
|
||||
}
|
||||
}
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
if ( isset($_GET['action']) ) {
|
||||
if ( isset($_GET['plugin']) )
|
||||
$plugin = trim($_GET['plugin']);
|
||||
$plugin = isset($_GET['plugin']) ? trim($_GET['plugin']) : '';
|
||||
|
||||
if ( 'upgrade-plugin' == $_GET['action'] ) {
|
||||
check_admin_referer('upgrade-plugin_' . $plugin);
|
||||
@@ -130,6 +137,36 @@ if ( isset($_GET['action']) ) {
|
||||
require_once('admin-header.php');
|
||||
do_plugin_upgrade($plugin);
|
||||
include('admin-footer.php');
|
||||
} elseif ('activate-plugin' == $_GET['action'] ) {
|
||||
check_admin_referer('activate-plugin_' . $plugin);
|
||||
if( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
|
||||
wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
|
||||
activate_plugin($plugin);
|
||||
wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
|
||||
die();
|
||||
}
|
||||
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
|
||||
<title><?php bloginfo('name') ?> › <?php _e('Plugin Reactivation'); ?> — <?php _e('WordPress'); ?></title>
|
||||
<?php
|
||||
wp_admin_css( 'css/global' );
|
||||
wp_admin_css( 'css/colors' );
|
||||
?>
|
||||
</head>
|
||||
<body>
|
||||
<?php
|
||||
if( isset($_GET['success']) )
|
||||
echo '<p>' . __('Plugin reactivated successfully.') . '</p>';
|
||||
|
||||
if( isset($_GET['failure']) ){
|
||||
echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
|
||||
error_reporting( E_ALL ^ E_NOTICE );
|
||||
@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
|
||||
include(ABSPATH . PLUGINDIR . '/' . $plugin);
|
||||
}
|
||||
echo "</body></html>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user