Context Navigation

← Previous Change
Next Change →

update.php

Timestamp:

05/29/2008 05:29:32 PM (18 years ago)

Author:

ryan

Message:

Make WP_Filesystem work with new directory constants. Props DD32. fixes #7059

File:

: 1 edited

trunk/wp-admin/includes/update.php (modified) (7 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/wp-admin/includes/update.php

-              r7999
+              r8009
         // Is a filesystem accessor setup?
         if ( ! $wp_filesystem || !is_object($wp_filesystem) )
+        if ( ! $wp_filesystem || ! is_object($wp_filesystem) )
                 WP_Filesystem();
 …
         //Get the base plugin folder
+        $base = $wp_filesystem->get_base_dir(WP_PLUGIN_DIR);
+        if ( empty($base) )
+                return new WP_Error('fs_nowordpress', __('Unable to locate WordPress directory.'));
+        $plugins_dir = $wp_filesystem->wp_plugins_dir();
+        if ( empty($plugins_dir) )
+                return new WP_Error('fs_no)plugins_dir', __('Unable to locate WordPress Plugin directory.'));
+        //And the same for the Content directory.
+        $content_dir = $wp_filesystem->wp_content_dir();
+        if( empty($content_dir) )
+                return new WP_Error('fs_no_content_dor', __('Unable to locate WordPress Content directory (wp-content).'));
+        $plugins_dir = trailingslashit( $plugins_dir );
+        $content_dir = trailingslashit( $content_dir );
         // Get the URL to the zip file
 …
         $package = $r->package;
         apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package));
         $file = download_url($package);
         if ( is_wp_error($file) )
+        $download_file = download_url($package);
+        if ( is_wp_error($download_file) )
                 return new WP_Error('download_failed', __('Download failed.'), $file->get_error_message());
         $working_dir = $wp_filesystem->get_base_dir(WP_CONTENT_DIR) . '/upgrade/' . basename($plugin, '.php');
+        $working_dir = $content_dir . 'upgrade/' . basename($plugin, '.php');
         // Clean up working directory
 …
         apply_filters('update_feedback', __('Unpacking the update'));
         // Unzip package to working directory
+        $result = unzip_file($file, $working_dir);
+        $result = unzip_file($download_file, $working_dir);
+        // Once extracted, delete the package
+        unlink($download_file);
         if ( is_wp_error($result) ) {
-                unlink($file);
                 $wp_filesystem->delete($working_dir, true);
                 return $result;
+        }
-        // Once extracted, delete the package
-        unlink($file);
         if ( is_plugin_active($plugin) ) {
 …
         // Remove the existing plugin.
         apply_filters('update_feedback', __('Removing the old version of the plugin'));
+        $plugin_dir = dirname($base . "/$plugin");
+        $plugin_dir = trailingslashit($plugin_dir);
+        $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
         // If plugin is in its own directory, recursively delete the directory.
         if ( strpos($plugin, '/') && $plugin_dir != $base . '/' ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
                 $deleted = $wp_filesystem->delete($plugin_dir, true);
+        if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
+                $deleted = $wp_filesystem->delete($this_plugin_dir, true);
         else
                 $deleted = $wp_filesystem->delete($base . '/' . $plugin);
         if ( !$deleted ) {
+                $deleted = $wp_filesystem->delete($plugins_dir . $plugin);
+        if ( ! $deleted ) {
                 $wp_filesystem->delete($working_dir, true);
                 return new WP_Error('delete_failed', __('Could not remove the old plugin'));
 …
         apply_filters('update_feedback', __('Installing the latest version'));
         // Copy new version of plugin into place.
+        if ( !copy_dir($working_dir, $base) ) {
+        $result = copy_dir($working_dir, $plugins_dir);
+        if ( is_wp_error($result) ) {
                 //$wp_filesystem->delete($working_dir, true); //TODO: Uncomment? This DOES mean that the new files are available in the upgrade folder if it fails.
                 return new WP_Error('install_failed', __('Installation failed'));
+                return $result;
+        }
 …
         if( empty($filelist) )
                 return false; //We couldnt find any files in the working dir
+                return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
         $folder = $filelist[0];
         $plugin = get_plugins('/' . $folder); //Pass it with a leading slash, search out the plugins in the folder,
+        $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
         $pluginfiles = array_keys($plugin); //Assume the requested plugin is the first in the list
         return  $folder . '/' . $pluginfiles[0]; //Pass it without a leading slash as WP requires
+        return  $folder . '/' . $pluginfiles[0];
+}

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changeset 8009 for trunk/wp-admin/includes/update.php

Legend:

trunk/wp-admin/includes/update.php

Download in other formats: