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

Timestamp:

03/04/2008 05:10:17 PM (17 years ago)

Author:

ryan

Message:

wp-fs fixes from DD32. see #5586

File:

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

trunk/wp-admin/includes/update.php

@@ -141 +141 @@
         return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
 
+    //Get the Base folder
+    $base = $wp_filesystem->get_base_dir();
+
     // Get the URL to the zip file
     $r = $current->response[ $plugin ];
@@ -149 +152 @@
     // Download the package
     $package = $r->package;
-    apply_filters('update_feedback', __("Downloading update from $package"));
+    apply_filters('update_feedback', sprintf(__("Downloading update from %s"), $package));
     $file = download_url($package);
 
@@ -156 +159 @@
 
     $name = basename($plugin, '.php');
-    $working_dir = ABSPATH . 'wp-content/upgrade/' . $name;
+    $working_dir = $base . 'wp-content/upgrade/' . $name;
 
     // Clean up working directory
@@ -176 +179 @@
     // Remove the existing plugin.
     apply_filters('update_feedback', __("Removing the old version of the plugin"));
-    $plugin_dir = dirname(ABSPATH . PLUGINDIR . "/$plugin");
+    $plugin_dir = dirname($base . PLUGINDIR . "/$plugin");
+    $plugin_dir = trailingslashit($plugin_dir);
     // If plugin is in its own directory, recursively delete the directory.
-    if ( '.' != $plugin_dir && ABSPATH . PLUGINDIR != $plugin_dir )
+    if ( '.' != $plugin_dir && $base . PLUGINDIR != $plugin_dir )
         $deleted = $wp_filesystem->delete($plugin_dir, true);
     else
-        $deleted = $wp_filesystem->delete(ABSPATH . PLUGINDIR . "/$plugin");
+        $deleted = $wp_filesystem->delete($base . PLUGINDIR . "/$plugin");
     if ( !$deleted ) {
         $wp_filesystem->delete($working_dir, true);
@@ -189 +193 @@
     apply_filters('update_feedback', __("Installing the latest version"));
     // Copy new version of plugin into place.
-    if ( !copy_dir($working_dir, ABSPATH . PLUGINDIR) ) {
+    if ( !copy_dir($working_dir, $base . PLUGINDIR) ) {
         //$wp_filesystem->delete($working_dir, true);
         return new WP_Error('install_failed', __('Installation failed'));