Wordpress 3.6

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

diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index 7dae3b773724953f484d9e452b22a52f534a5fd6..728385b70bff4c00fedeea3e510996a251051ada 100644 (file)
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -97,7 +97,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                if ( ! $this->ftp->fget($temphandle, $file) ) {
                        fclose($temphandle);
                        unlink($temp);
-                       return ''; //Blank document, File does exist, Its just blank.
+                       return ''; //Blank document, File does exist, It's just blank.
                }
 
                fseek($temphandle, 0); //Skip back to the start of the file being written to
@@ -318,6 +318,10 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                                        $struc['files'] = array();
                        }
 
+                       // 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;
                }
                return $ret;
@@ -327,5 +331,3 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
                $this->ftp->quit();
        }
 }
-
-?>