Changeset 21223

Timestamp:

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

Author:

dd32

Message:

WP_Filesystem: Return symlinked directory names correctly, previously the FTP extensions would return it as 'source -> dest' instead of simply 'source'. Props kurtpayne. Fixes #17846

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-ftpext.php (modified) (1 diff)
• class-wp-filesystem-ftpsockets.php (modified) (1 diff)

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

@@ -331 +331 @@
         }
 
+        // Replace symlinks formatted as "source -> target" with just the source name
+        if ( $b['islink'] )
+            $b['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $b['name'] );
+
         return $b;
     }

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

@@ -319 +319 @@
             }
 
+            // Replace symlinks formatted as "source -> target" with just the source name
+            if ( $struc['islink'] )
+                $struc['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $struc['name'] );
+
             $ret[ $struc['name'] ] = $struc;
         }