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

Timestamp:

11/05/2008 05:07:45 PM (18 years ago)

Author:

ryan

Message:

Support installation of plugins living in a subdir in svn. Props DD32. fixes #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
+        apply_filters('install_feedback', __('Installing 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'));
+        //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'] ) )
+                        return new WP_Error('mkdir_failed', __('Could not create directory'), $res['to']);      
+
         // Copy new version of plugin into place.
-        $result = copy_dir($working_dir, $plugins_dir);
+        $result = copy_dir($res['from'], $res['to']);
         if ( is_wp_error($result) ) {
                 $wp_filesystem->delete($working_dir, true);
@@ -761 +764 @@
         }
 
-        //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);
 
-        if( empty($filelist) )
-                return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-        $folder = $filelist[0];
+        $folder = trailingslashit(str_replace($plugins_dir, '', $res['to']));
         $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];
 }
 
@@ -840 +837 @@
         }
 
-        //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
+        apply_filters('install_feedback', __('Installing 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'));
+        //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'] ) )
+                        return new WP_Error('mkdir_failed', __('Could not create directory'), $res['to']);      
+
         // Copy new version of plugin into place.
-        $result = copy_dir($working_dir, $plugins_dir);
+        $result = copy_dir($res['from'], $res['to']);
         if ( is_wp_error($result) ) {
                 $wp_filesystem->delete($working_dir, true);
@@ -856 +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);
 
-        if( empty($filelist) )
-                return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-
-        $folder = $filelist[0];
+        $folder = trailingslashit(str_replace($plugins_dir, '', $res['to']));
         $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];
 }