From c593c6fa95f0a42a6c4fc26a0944fb3f37cfdea6 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sat, 20 Aug 2016 23:44:07 +0000 Subject: [PATCH] Media: `wp_get_attachment_link()` fails to output text for non-images if the attachment post doesn't have a title and `$text` (argument #5) was not passed to the func. In this case, use the filename. Props Jonnyauk, henry.wright. Fixes #37343. git-svn-id: https://develop.svn.wordpress.org/trunk@38295 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/post-template.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/post-template.php b/src/wp-includes/post-template.php index be152523f0..50667a71a5 100644 --- a/src/wp-includes/post-template.php +++ b/src/wp-includes/post-template.php @@ -1445,11 +1445,13 @@ function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $ function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) { $_post = get_post( $id ); - if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) ) + if ( empty( $_post ) || ( 'attachment' !== $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) ) { return __( 'Missing Attachment' ); + } - if ( $permalink ) + if ( $permalink ) { $url = get_attachment_link( $_post->ID ); + } if ( $text ) { $link_text = $text; @@ -1459,9 +1461,13 @@ function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = fals $link_text = ''; } - if ( trim( $link_text ) == '' ) + if ( '' === trim( $link_text ) ) { $link_text = $_post->post_title; + } + if ( '' === trim( $link_text ) ) { + $link_text = esc_html( pathinfo( get_attached_file( $_post->ID ), PATHINFO_FILENAME ) ); + } /** * Filters a retrieved attachment page link. *