Ticket #6262: 6262.2.diff

wp-admin/includes/plugin.php

@@ -31 +31 @@
-        return array('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version);
-}
-
-
+$plugin_folder = ''
-        global $wp_plugins;
-
-        if ( isset( $wp_plugins ) ) {
@@ -40 +40 @@
-
-        $wp_plugins = array ();
-        $plugin_root = ABSPATH . PLUGINDIR;
+        if( !empty($plugin_folder) )
+                $plugin_root .= $plugin_folder;
-
-        // Files in wp-content/plugins directory
-        $plugins_dir = @ opendir( $plugin_root);
@@ -86 +88 @@
-        return $wp_plugins;
-}
-
+function is_plugin_active($plugin){
+        return in_array($plugin, get_option('active_plugins'));
+}
+
-function activate_plugin($plugin, $redirect = '') {
-                $current = get_option('active_plugins');
-                $plugin = trim($plugin);
@@ -109 +115 @@
-                return null;
-}
-
-
+, $silent= false
-        $current = get_option('active_plugins');
-
-        if ( !is_array($plugins) )
@@ -121 +127 @@
-                        continue;
-                if ( ( $key = array_search( $plugin, $current) ) !== false )
-                        array_splice($current, $key, 1 ); // Fixed Array-fu!
-
+
+
-        }
-
-        update_option('active_plugins', $current);

wp-admin/includes/update.php

@@ -197 +197 @@
-        // Once installed, delete the package
-        unlink($file);
-
+        if( is_plugin_active($plugin) ){
+                //Deactivate the plugin
+                apply_filters('update_feedback', __('Deactivating the plugin'));
+                deactivate_plugins($plugin, true);
+        }
+
-        // Remove the existing plugin.
-        apply_filters('update_feedback', __('Removing the old version of the plugin'));
-        $plugin_dir = dirname($base . PLUGINDIR . "/$plugin");
@@ -225 +231 @@
-
-        // Force refresh of plugin update information
-        delete_option('update_plugins');
+        
+        //Return the new plugin file.
+        if( ! preg_match('!/([a-z0-9\-]+)/?$!i', $working_dir, $mat) )
+                return false;
+        $plugin = get_plugins('/' . $mat[1]); //Pass it with a leading slash
+        $list = array_keys($plugin);
+        return $mat[1] . '/' . $list[0]; //Pass it without a leading slash.
-}
-
-?>

wp-admin/update.php

@@ -86 +86 @@
-                else 
-                        $message = $message->get_error_message();
-        }
-
+\n
-}
-
-function do_plugin_upgrade($plugin) {
@@ -95 +95 @@
-        $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) ){
-                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 +110 @@
-                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');
-
-
+{
-                show_message($result);
-
-
+
+
+
+
+
+
+
+
-        echo '</div>';
-}
-
-if ( isset($_GET['action']) ) {
-
-
+
-
-        if ( 'upgrade-plugin' == $_GET['action'] ) {
-                check_admin_referer('upgrade-plugin_' . $plugin);
@@ -130 +137 @@
-                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') ?> &rsaquo; <?php _e('Plugin Reactivation'); ?> &#8212; <?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>";
-        }
-}
-