Changeset 21221 for trunk/wp-admin/includes/class-wp-filesystem-base.php

Timestamp:

07/06/2012 10:41:32 AM (11 years ago)

Author:

dd32

Message:

WP_Filesystem: Correct a rare case where the FTP directory will be detected incorrectly when the final path token exists higher in the chain, for example /x/x/Z/x/Z/ would be detected as /x/x/Z/. Fixes #20934

File:

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

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

@@ -194 +194 @@
 
         $folder_parts = explode('/', $folder);
-        $last_path = $folder_parts[ count($folder_parts) - 1 ];
+        $last_index = array_pop( array_keys( $folder_parts ) );
+        $last_path = $folder_parts[ $last_index ];
 
         $files = $this->dirlist( $base );
 
-        foreach ( $folder_parts as $key ) {
-            if ( $key == $last_path )
+        foreach ( $folder_parts as $index => $key ) {
+            if ( $index == $last_index )
                 continue; //We want this to be caught by the next code block.