Make WordPress Core

Ticket #44091: 44091.2.diff

File 44091.2.diff, 2.6 KB (added by allendav, 8 years ago)

Fix the folder name

  • 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        require_once( ABSPATH . 'wp-admin/includes/file.php' );
     6261
     6262        $upload_dir   = wp_upload_dir();
     6263        $exports_dir  = trailingslashit( $upload_dir['basedir'] ) . 'wp-personal-data-exports/';
     6264
     6265        /**
     6266         * Filters the privacy personal data exports dir.
     6267         *
     6268         * @since 4.9.6
     6269         *
     6270         * @param string $exports_dir Exports directory.
     6271         */
     6272        $exports_dir  = apply_filters( 'wp_privacy_exports_basedir', $exports_dir );
     6273
     6274        return $exports_dir;
     6275}
     6276
     6277/**
     6278 * Returns the URL to the directory for privacy personal data export files.
     6279 * See also wp_privacy_exports_basedir
     6280 *
     6281 * @since 4.9.6
     6282 *
     6283 * @return string Exports directory URL.
     6284 */
     6285function wp_privacy_exports_baseurl() {
     6286        require_once( ABSPATH . 'wp-admin/includes/file.php' );
     6287
     6288        $upload_dir   = wp_upload_dir();
     6289        $exports_url  = trailingslashit( $upload_dir['baseurl'] ) . 'wp-personal-data-exports/';
     6290
     6291        /**
     6292         * Filters the privacy personal data exports URL.
     6293         *
     6294         * @since 4.9.6
     6295         *
     6296         * @param string $exports_url Exports directory URL.
     6297         */
     6298        $exports_url  = apply_filters( 'wp_privacy_exports_baseurl', $exports_url );
     6299
     6300        return $exports_url;
     6301}
     6302
     6303/**
    62526304 * Schedule a `WP_Cron` job to delete expired export files.
    62536305 *
    62546306 * @since 4.9.6
     
    62756327 * @since 4.9.6
    62766328 */
    62776329function wp_privacy_delete_old_export_files() {
    6278         require_once( ABSPATH . 'wp-admin/includes/file.php' );
    6279 
    6280         $upload_dir   = wp_upload_dir();
    6281         $exports_dir  = trailingslashit( $upload_dir['basedir'] . '/exports' );
     6330        $exports_dir  = wp_privacy_exports_basedir();
    62826331        $export_files = list_files( $exports_dir, 100, array( 'index.html' ) );
    62836332
    62846333        /**