WordPress 3.5.1

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-filesystem-ftpext.php

diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index 79bacfbaa4d719fde8030e157902394192aaa235..d087189147ebe626040f01a3c9a14e977a1dd96e 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -330,6 +330,10 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
                        }
                }
 
+               // Replace symlinks formatted as "source -> target" with just the source name
+               if ( $b['islink'] )
+                       $b['name'] = preg_replace( '/(\s*->\s*.*)$/', '', $b['name'] );
+
                return $b;
        }
 
@@ -387,5 +391,3 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
                        ftp_close($this->link);
        }
 }
-
-?>