Make WordPress Core


Ignore:
Timestamp:
07/05/2018 03:07:23 PM (8 years ago)
Author:
johnbillion
Message:

Media: Limit thumbnail file deletions to the same directory as the original file.

Merges [43393] into the 4.1 branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1/src/wp-includes/post.php

    r42064 r43401  
    48074807        do_action( 'deleted_post', $post_id );
    48084808
     4809        wp_delete_attachment_files( $post_id, $meta, $backup_sizes, $file );
     4810
     4811        clean_post_cache( $post );
     4812
     4813        return $post;
     4814}
     4815
     4816/**
     4817 * Deletes all files that belong to the given attachment.
     4818 *
     4819 * @since 4.9.7
     4820 *
     4821 * @param int    $post_id      Attachment ID.
     4822 * @param array  $meta         The attachment's meta data.
     4823 * @param array  $backup_sizes The meta data for the attachment's backup images.
     4824 * @param string $file         Absolute path to the attachment's file.
     4825 * @return bool True on success, false on failure.
     4826 */
     4827function wp_delete_attachment_files( $post_id, $meta, $backup_sizes, $file ) {
     4828        global $wpdb;
     4829
    48094830        $uploadpath = wp_upload_dir();
     4831        $deleted    = true;
    48104832
    48114833        if ( ! empty($meta['thumb']) ) {
    … …  
    48134835                if (! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $wpdb->esc_like( $meta['thumb'] ) . '%', $post_id)) ) {
    48144836                        $thumbfile = str_replace(basename($file), $meta['thumb'], $file);
    4815                         /** This filter is documented in wp-admin/custom-header.php */
    4816                         $thumbfile = apply_filters( 'wp_delete_file', $thumbfile );
    4817                         @ unlink( path_join($uploadpath['basedir'], $thumbfile) );
     4837                        if ( ! empty( $thumbfile ) ) {
     4838                                $thumbfile = path_join( $uploadpath['basedir'], $thumbfile );
     4839                                $thumbdir  = path_join( $uploadpath['basedir'], dirname( $file ) );
     4840
     4841                                if ( ! wp_delete_file_from_directory( $thumbfile, $thumbdir ) ) {
     4842                                        $deleted = false;
     4843                                }
     4844                        }
    48184845                }
    48194846        }
    … …  
    48214848        // Remove intermediate and backup images if there are any.
    48224849        if ( isset( $meta['sizes'] ) && is_array( $meta['sizes'] ) ) {
     4850                $intermediate_dir = path_join( $uploadpath['basedir'], dirname( $file ) );
    48234851                foreach ( $meta['sizes'] as $size => $sizeinfo ) {
    48244852                        $intermediate_file = str_replace( basename( $file ), $sizeinfo['file'], $file );
    4825                         /** This filter is documented in wp-admin/custom-header.php */
    4826                         $intermediate_file = apply_filters( 'wp_delete_file', $intermediate_file );
    4827                         @ unlink( path_join( $uploadpath['basedir'], $intermediate_file ) );
     4853                        if ( ! empty( $intermediate_file ) ) {
     4854                                $intermediate_file = path_join( $uploadpath['basedir'], $intermediate_file );
     4855
     4856                                if ( ! wp_delete_file_from_directory( $intermediate_file, $intermediate_dir ) ) {
     4857                                        $deleted = false;
     4858                                }
     4859                        }
    48284860                }
    48294861        }
    48304862
    48314863        if ( is_array($backup_sizes) ) {
     4864                $del_dir = path_join( $uploadpath['basedir'], dirname( $meta['file'] ) );
    48324865                foreach ( $backup_sizes as $size ) {
    48334866                        $del_file = path_join( dirname($meta['file']), $size['file'] );
    4834                         /** This filter is documented in wp-admin/custom-header.php */
    4835                         $del_file = apply_filters( 'wp_delete_file', $del_file );
    4836                         @ unlink( path_join($uploadpath['basedir'], $del_file) );
    4837                 }
    4838         }
    4839 
    4840         /** This filter is documented in wp-admin/custom-header.php */
    4841         $file = apply_filters( 'wp_delete_file', $file );
    4842 
    4843         if ( ! empty($file) )
    4844                 @ unlink($file);
    4845 
    4846         clean_post_cache( $post );
    4847 
    4848         return $post;
     4867                        if ( ! empty( $del_file ) ) {
     4868                                $del_file = path_join( $uploadpath['basedir'], $del_file );
     4869
     4870                                if ( ! wp_delete_file_from_directory( $del_file, $del_dir ) ) {
     4871                                        $deleted = false;
     4872                                }
     4873                        }
     4874                }
     4875        }
     4876
     4877        if ( ! wp_delete_file_from_directory( $file, $uploadpath['basedir'] ) ) {
     4878                $deleted = false;
     4879        }
     4880
     4881        return $deleted;
    48494882}
    48504883
Note: See TracChangeset for help on using the changeset viewer.