Changeset 11926 for trunk/wp-admin/includes/class-wp-upgrader.php

Timestamp:

09/13/2009 11:00:45 PM (16 years ago)

Author:

azaozz

Message:

Plugin/Theme installer: Do not bail if empty destination directory exists, props dd32, fixes #10775

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -211 +211 @@
         }
 
-        //If we're not clearing the destination folder, and something exists there allready, Bail.
-        if ( ! $clear_destination && $wp_filesystem->exists($remote_destination) ) {
-            $wp_filesystem->delete($remote_source, true); //Clear out the source files.
-            return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
-        } else if ( $clear_destination ) {
-            //We're going to clear the destination if theres something there
-            $this->skin->feedback('remove_old');
-
-            $removed = true;
-            if ( $wp_filesystem->exists($remote_destination) )
+        if ( $wp_filesystem->exists($remote_destination) ) {
+            if ( $clear_destination ) {
+                //We're going to clear the destination if theres something there
+                $this->skin->feedback('remove_old');
                 $removed = $wp_filesystem->delete($remote_destination, true);
-
-            $removed = apply_filters('upgrader_clear_destination', $removed, $local_destination, $remote_destination, $hook_extra);
-
-            if ( is_wp_error($removed) )
-                return $removed;
-            else if ( ! $removed )
-                return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+                $removed = apply_filters('upgrader_clear_destination', $removed, $local_destination, $remote_destination, $hook_extra);
+
+                if ( is_wp_error($removed) )
+                    return $removed;
+                else if ( ! $removed )
+                    return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+            } else {
+                //If we're not clearing the destination folder and something exists there allready, Bail.
+                //But first check to see if there are actually any files in the folder.
+                $_files = $wp_filesystem->dirlist($remote_destination);
+                if ( ! empty($_files) ) {
+                    $wp_filesystem->delete($remote_source, true); //Clear out the source files.
+                    return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
+                }
+            }
         }