IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace wp_upload_dir() with the new wp_get_upload_dir() in all cases where a file is not being uploaded. Deprecate _wp_upload_dir_baseurl(), and replace it with wp_get_upload_dir().

Browse Source 
See #34359.
Built from https://develop.svn.wordpress.org/trunk@36569


git-svn-id: http://core.svn.wordpress.org/trunk@36536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz
2016-02-18 00:24:27 +00:00
parent c6ee6246ef
commit 2d94e025a2
7 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
wp-includes/media.php
View File

@@ -902,27 +902,6 @@ function _wp_get_attachment_relative_path( $file ) {
return $dirname;
}
/**
* Caches and returns the base URL of the uploads directory.
*
* @since 4.4.0
* @access private
*
* @return string The base URL, cached.
*/
function _wp_upload_dir_baseurl() {
static $baseurl = array();
$blog_id = get_current_blog_id();
if ( empty( $baseurl[$blog_id] ) ) {
$uploads_dir = wp_upload_dir();
$baseurl[$blog_id] = $uploads_dir['baseurl'];
}
return $baseurl[$blog_id];
}
/**
* Get the image size as array from its meta data.
*
@@ -1045,8 +1024,8 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
$dirname = trailingslashit( $dirname );
}
$image_baseurl = _wp_upload_dir_baseurl();
$image_baseurl = trailingslashit( $image_baseurl ) . $dirname;
$upload_dir = wp_get_upload_dir();
$image_baseurl = trailingslashit( $upload_dir['baseurl'] ) . $dirname;
/*
* Images that have been edited in WordPress after being uploaded will
@@ -3739,7 +3718,7 @@ function wp_maybe_generate_attachment_metadata( $attachment ) {
function attachment_url_to_postid( $url ) {
global $wpdb;
$dir = wp_upload_dir();
$dir = wp_get_upload_dir();
$path = $url;
$site_url = parse_url( $dir['url'] );