Changeset 38295

Timestamp:

08/20/2016 11:44:07 PM (8 years ago)

Author:

wonderboymusic

Message:

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.

File:

• trunk/src/wp-includes/post-template.php (modified) (2 diffs)

trunk/src/wp-includes/post-template.php

@@ -1446 +1446 @@
     $_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 ) {
@@ -1460 +1462 @@
     }
 
-    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.