Ticket #46040: 46040.diff

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

@@ -668 +668 @@
                 return false;
         }
 
+                /**
+                * Is the path a symbolic link.
+                *
+                * @param string $path File path.
+                * @return bool Whether $path is a symbolic link.
+                */
+                public function is_link( $path ) {
+                        return false;
+                }
+
         /**
          * Check if a file is readable.
          *

src/wp-admin/includes/class-wp-filesystem-direct.php

@@ -287 +287 @@
                 }
                 $file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
 
-                if ( 'f' == $type || $this->is_file( $file ) ) {
+                if ( 'f' == $type || $this->is_file( $file ) || 'l' === $type || $this->is_link( $file ) ) {
                         return @unlink( $file );
                 }
                 if ( ! $recursive && $this->is_dir( $file ) ) {
@@ -313 +313 @@
 
                 return $retval;
         }
+
         /**
          * @param string $file
          * @return bool
@@ -320 +321 @@
         public function exists( $file ) {
                 return @file_exists( $file );
         }
+
         /**
          * @param string $file
          * @return bool
@@ -327 +329 @@
         public function is_file( $file ) {
                 return @is_file( $file );
         }
+
         /**
          * @param string $path
          * @return bool
@@ -336 +339 @@
         }
 
         /**
+         * Is the path a symbolic link.
+         *
+         * @param string $path File path.
+         * @return bool Whether $path is a symbolic link.
+         */
+        public function is_link( $path ) {
+                return @is_link( $path );
+        }
+
+        
+        /**
          * @param string $file
          * @return bool
          */

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

@@ -361 +361 @@
         }
 
         /**
+         * Is the path a symbolic link.
+         *
+         * @param string $path File path.
+         * @return bool Whether $path is a symbolic link.
+         */
+        public function is_link( $path ) {
+                return false;
+        }
+
+        /**
          * @param string $file
          * @return bool
          */

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

@@ -372 +372 @@
         }
 
         /**
+         * Is the path a symbolic link.
+         *
+         * @param string $path File path.
+         * @return bool Whether $path is a symbolic link.
+         */
+        public function is_link( $path ) {
+                return false;
+        }
+
+        /**
          * @param string $file
          * @return bool
          */

src/wp-admin/includes/class-wp-filesystem-ssh2.php

@@ -417 +417 @@
          * @return bool
          */
         public function delete( $file, $recursive = false, $type = false ) {
-                if ( 'f' == $type || $this->is_file( $file ) ) {
+                if ( 'f' == $type || $this->is_file( $file ) || 'l' === $type || $this->is_link( $file ) ) {
                         return ssh2_sftp_unlink( $this->sftp_link, $file );
                 }
                 if ( ! $recursive ) {
@@ -457 +457 @@
         }
 
         /**
+         * Is the path a symbolic link.
+         *
+         * @param string $path File path.
+         * @return bool Whether $path is a symbolic link.
+         */
+        public function is_link( $path ) {
+                return is_link( $this->sftp_path( $path ) );
+        }
+
+        /**
          * @param string $file
          * @return bool
          */

src/wp-admin/includes/class-wp-upgrader.php

@@ -394 +394 @@
 
                 // Check writability.
                 foreach ( $files as $filename => $file_details ) {
-                        if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) {
+                        if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) && ! $wp_filesystem->is_link( $remote_destination . $filename ) ) {
                                 // Attempt to alter permissions to allow writes and try again.
                                 $wp_filesystem->chmod( $remote_destination . $filename, ( 'd' == $file_details['type'] ? FS_CHMOD_DIR : FS_CHMOD_FILE ) );
                                 if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) {