mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-27 18:13:00 +01:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Avoid warning when non-existent ID pass to wp_get_attachment_link(). Tidy formatting of wp_get_attachment_link(). Props SergeyBiryukov, Jayjdk. fixes #18491

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@19210 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren 2011-11-08 14:08:25 +00:00
parent e263cfc8b5
commit 74c7564622
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
wp-includes/post-template.php
View File

@ -1152,27 +1152,26 @@ function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $
* @param string $text Optional, default is false. If string, then will be link text. * @param string $text Optional, default is false. If string, then will be link text.
* @return string HTML content. * @return string HTML content.
*/ */
function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false) { function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false ) {
$id = intval($id); $id = intval( $id );
$_post = & get_post( $id ); $_post = & get_post( $id );
if ( ('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'); return __( 'Missing Attachment' );
if ( $permalink ) if ( $permalink )
$url = get_attachment_link($_post->ID); $url = get_attachment_link( $_post->ID );
$post_title = esc_attr($_post->post_title); $post_title = esc_attr( $_post->post_title );
if ( $text ) { if ( $text )
$link_text = esc_attr($text); $link_text = esc_attr( $text );
} elseif ( ( is_int($size) && $size != 0 ) or ( is_string($size) && $size != 'none' ) or $size != false ) { elseif ( ( is_int( $size ) && $size != 0 ) || ( is_string( $size ) && $size != 'none' ) || $size != false )
$link_text = wp_get_attachment_image($id, $size, $icon); $link_text = wp_get_attachment_image( $id, $size, $icon );
} else { else
$link_text = ''; $link_text = '';
}
if( trim($link_text) == '' ) if ( trim( $link_text ) == '' )
$link_text = $_post->post_title; $link_text = $_post->post_title;
return apply_filters( 'wp_get_attachment_link', "<a href='$url' title='$post_title'>$link_text</a>", $id, $size, $permalink, $icon, $text ); return apply_filters( 'wp_get_attachment_link', "<a href='$url' title='$post_title'>$link_text</a>", $id, $size, $permalink, $icon, $text );