Changeset 9664 for trunk/wp-admin/includes/plugin-install.php

Timestamp:

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

Author:

ryan

Message:

Revert [9523]. fixes #8195 see #7395

File:

• trunk/wp-admin/includes/plugin-install.php (modified) (4 diffs)

trunk/wp-admin/includes/plugin-install.php

@@ -745 +745 @@
     }
 
+    //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) );
+
+    if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
+        $wp_filesystem->delete($working_dir, true);
+        return new WP_Error('install_folder_exists', __('Folder allready exists.'), $filelist[0] );
+    }
+
     apply_filters('install_feedback', __('Installing 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']);
+    $result = copy_dir($working_dir, $plugins_dir);
     if ( is_wp_error($result) ) {
         $wp_filesystem->delete($working_dir, true);
@@ -764 +761 @@
     }
 
+    //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) );
+
     // Remove working directory
     $wp_filesystem->delete($working_dir, true);
 
-    $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];
 }
 
@@ -837 +840 @@
     }
 
+    //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) );
+
+    if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
+        $wp_filesystem->delete($working_dir, true);
+        return new WP_Error('install_folder_exists', __('Folder allready exists.'), $filelist[0] );
+    }
+
     apply_filters('install_feedback', __('Installing 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']);
+    $result = copy_dir($working_dir, $plugins_dir);
     if ( is_wp_error($result) ) {
         $wp_filesystem->delete($working_dir, true);
@@ -857 +856 @@
     }
 
+    //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) );
+
     // Remove working directory
     $wp_filesystem->delete($working_dir, true);
 
-    $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];
 }