Ticket #30945: class-wp-upgrader.diff

class-wp-upgrader.php

@@ -405 +405 @@
                         $protected_directories = array_merge( $protected_directories, $wp_theme_directories );
                 }
                 if ( in_array( $destination, $protected_directories ) ) {
-                        $remote_destination = trailingslashit( $remote_destination ) . trailingslashit( basename( $source ) );
-                        $destination = trailingslashit( $destination ) . trailingslashit( basename( $source ) );
+
+                        if ( isset( $args['hook_extra']['plugin'] ) ) {
+                                // Get the plugin top directory
+                                $new_dest = current(explode(DIRECTORY_SEPARATOR, $args['hook_extra']['plugin']));
+                        } else {
+                                $new_dest = basename( $source );
+                        }
+
+                        $remote_destination = trailingslashit( $remote_destination ) .trailingslashit( $new_dest );
+                        $destination = trailingslashit( $destination ) . trailingslashit( $new_dest );
+
                 }
 
                 if ( $clear_destination ) {