Make WordPress Core

Ticket #44091: 44091.3.diff

File 44091.3.diff, 2.5 KB (added by allendav, 8 years ago)
  • src/wp-admin/includes/file.php

     
    20232023        }
    20242024
    20252025        // Create the exports folder if needed.
    2026         $upload_dir  = wp_upload_dir();
    2027         $exports_dir = trailingslashit( $upload_dir['basedir'] . '/exports' );
    2028         $exports_url = trailingslashit( $upload_dir['baseurl'] . '/exports' );
     2026        $exports_dir = wp_privacy_exports_basedir();
     2027        $exports_url = wp_privacy_exports_baseurl();
    20292028
    20302029        $result = wp_mkdir_p( $exports_dir );
    20312030        if ( is_wp_error( $result ) ) {
  • src/wp-includes/functions.php

     
    62496249}
    62506250
    62516251/**
     6252 * Returns the directory (on the file system) for privacy personal data export files.
     6253 * See also wp_privacy_exports_baseurl
     6254 *
     6255 * @since 4.9.6
     6256 *
     6257 * @return string Exports directory.
     6258 */
     6259function wp_privacy_exports_basedir() {
     6260        $upload_dir   = wp_upload_dir();
     6261        $exports_dir  = trailingslashit( $upload_dir['basedir'] ) . 'wp-personal-data-exports' . DIRECTORY_SEPARATOR;
     6262
     6263        /**
     6264         * Filters the privacy personal data exports dir.
     6265         *
     6266         * @since 4.9.6
     6267         *
     6268         * @param string $exports_dir Exports directory.
     6269         */
     6270        $exports_dir  = apply_filters( 'wp_privacy_exports_basedir', $exports_dir );
     6271
     6272        return $exports_dir;
     6273}
     6274
     6275/**
     6276 * Returns the URL to the directory for privacy personal data export files.
     6277 * See also wp_privacy_exports_basedir
     6278 *
     6279 * @since 4.9.6
     6280 *
     6281 * @return string Exports directory URL.
     6282 */
     6283function wp_privacy_exports_baseurl() {
     6284        $upload_dir   = wp_upload_dir();
     6285        $exports_url  = trailingslashit( $upload_dir['baseurl'] ) . 'wp-personal-data-exports' . DIRECTORY_SEPARATOR;
     6286
     6287        /**
     6288         * Filters the privacy personal data exports URL.
     6289         *
     6290         * @since 4.9.6
     6291         *
     6292         * @param string $exports_url Exports directory URL.
     6293         */
     6294        $exports_url  = apply_filters( 'wp_privacy_exports_baseurl', $exports_url );
     6295
     6296        return $exports_url;
     6297}
     6298
     6299/**
    62526300 * Schedule a `WP_Cron` job to delete expired export files.
    62536301 *
    62546302 * @since 4.9.6
     
    62776325function wp_privacy_delete_old_export_files() {
    62786326        require_once( ABSPATH . 'wp-admin/includes/file.php' );
    62796327
    6280         $upload_dir   = wp_upload_dir();
    6281         $exports_dir  = trailingslashit( $upload_dir['basedir'] . '/exports' );
     6328        $exports_dir  = wp_privacy_exports_basedir();
    62826329        $export_files = list_files( $exports_dir, 100, array( 'index.html' ) );
    62836330
    62846331        /**