Changeset 21222

Timestamp:

07/06/2012 11:19:46 AM (12 years ago)

Author:

dd32

Message:

WP_Filesystem: When recursivly searching for a directory path, only search for unfound directory entries. This solves a case where the same directory may be entered twice inadvertantly when nested directories using the same name exist. Fixes #20652

File:

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

trunk/wp-admin/includes/class-wp-filesystem-base.php

@@ -212 +212 @@
                 if ( $this->verbose )
                     printf( __('Changing to %s') . '<br/>', $newdir );
-                if ( $ret = $this->search_for_folder( $folder, $newdir, $loop) )
+                // only search for the remaining path tokens in the directory, not the full path again
+                $newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
+                if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) )
                     return $ret;
             }