WordPress.org
Get WordPress

Make WordPress Core

Ticket #17262: 17263.interdiff-8-9.txt

File 17263.interdiff-8-9.txt, 996 bytes (added by killua99, 8 years ago)

Interdiff betweek path 8 and 9 (helps to keep tracks of the progress and evolution of the patch)

Line 
1diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php
2index 76952d6140..ecac41b7a2 100644
3--- a/src/wp-includes/media.php
4+++ b/src/wp-includes/media.php
5@@ -976,7 +976,7 @@ function wp_get_attachment_image_file( $attachment_id, $size = 'thumbnail' ) {
6 return null;
7 }
8
9- $wp_upload_dir = wp_upload_dir();
10+ $wp_upload_dir = wp_upload_dir( null, null );
11
12 $path = $wp_upload_dir['basedir'] . '/' . trailingslashit( $file_path ) . $file_name;
13
14diff --git a/src/wp-includes/post.php b/src/wp-includes/post.php
15index eb69ac727b..5250aaa294 100644
16--- a/src/wp-includes/post.php
17+++ b/src/wp-includes/post.php
18@@ -5689,6 +5689,7 @@ function wp_get_attachment_caption( $post_id = 0 ) {
19 * Retrieve thumbnail for an attachment.
20 *
21 * @since 2.1.0
22+ * @deprecated 5.2 Use wp_get_attachment_image_file( $attachment_id, $size = 'thumbnail' )
23 *
24 * @param int $post_id Optional. Attachment ID. Default 0.
25 * @return string|false False on failure. Thumbnail file path on success.