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

Timestamp:

11/13/2008 06:48:54 PM (16 years ago)

Author:

ryan

Message:

Revert [9523]. fixes #8195 see #7395

File:

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

trunk/wp-admin/includes/update.php

@@ -247 +247 @@
 
     apply_filters('update_feedback', __('Installing the latest version'));
-
+    // Copy new version of plugin into place.
+    $result = copy_dir($working_dir, $plugins_dir);
+    if ( is_wp_error($result) ) {
+        $wp_filesystem->delete($working_dir, true);
+        return $result;
+    }
+
+    //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
     $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-
-    //find base plugin directory
-    $res = update_pluginfiles_base_dir($working_dir . '/' . $filelist[0], $plugins_dir . $filelist[0]);
-
-    //Create folder if not exists.
-    if( ! $wp_filesystem->exists( $res['to'] ) )
-        if ( ! $wp_filesystem->mkdir( $res['to'], 0755 ) )
-            return new WP_Error('mkdir_failed', __('Could not create directory'), $res['to']);  
-
-    // Copy new version of plugin into place.
-    $result = copy_dir($res['from'], $res['to']);
-    if ( is_wp_error($result) ) {
-        $wp_filesystem->delete($working_dir, true);
-        return $result;
-    }
 
     // Remove working directory
@@ -271 +263 @@
     delete_option('update_plugins');
 
-    $folder = trailingslashit(str_replace($plugins_dir, '', $res['to']));
+    if( empty($filelist) )
+        return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
+
+    $folder = $filelist[0];
     $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 the plugin files name.
-    return $folder . $pluginfiles[0];
+    return  $folder . '/' . $pluginfiles[0];
 }