WordPress.org

Make WordPress Core

Changeset 10495


Ignore:
Timestamp:
02/04/09 15:12:24 (7 years ago)
Author:
azaozz
Message:

wp_get_attachment_link() variable upgrade, props noel, fixes #9036

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/media.php

    r10227 r10495  
    690690 * 
    691691 * @since 2.5.0 
    692  */ 
    693 function previous_image_link() { 
    694     adjacent_image_link(true); 
     692 * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string. 0 or 'none' will default to post_title or $text; 
     693 * @param string $text Optional, default is false. If included, link will reflect $text variable. 
     694 * @return string HTML content. 
     695 */ 
     696function previous_image_link($size = 'thumbnail', $text = false) { 
     697    adjacent_image_link(true, $size, $text); 
    695698} 
    696699 
     
    699702 * 
    700703 * @since 2.5.0 
    701  */ 
    702 function next_image_link() { 
    703     adjacent_image_link(false); 
     704 * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string. 0 or 'none' will default to post_title or $text; 
     705 * @param string $text Optional, default is false. If included, link will reflect $text variable. 
     706 * @return string HTML content. 
     707 */ 
     708function next_image_link($size = 'thumbnail', $text = false) { 
     709    adjacent_image_link(false, $size, $text); 
    704710} 
    705711 
     
    713719 * @param bool $prev Optional. Default is true to display previous link, true for next. 
    714720 */ 
    715 function adjacent_image_link($prev = true) { 
     721function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) { 
    716722    global $post; 
    717723    $post = get_post($post); 
     
    725731 
    726732    if ( isset($attachments[$k]) ) 
    727         echo wp_get_attachment_link($attachments[$k]->ID, 'thumbnail', true); 
     733        echo wp_get_attachment_link($attachments[$k]->ID, $size, true, false, $text); 
    728734} 
    729735 
  • trunk/wp-includes/post-template.php

    r10490 r10495  
    909909 * 
    910910 * @param int $id Optional. Post ID. 
    911  * @param string $size Optional. Image size. 
     911 * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string. 
    912912 * @param bool $permalink Optional, default is false. Whether to add permalink to image. 
    913913 * @param bool $icon Optional, default is false. Whether to include icon. 
     914 * @param string $text Optional, default is false. If string, then will be link text. 
    914915 * @return string HTML content. 
    915916 */ 
    916 function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false) { 
     917function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false) { 
    917918    $id = intval($id); 
    918919    $_post = & get_post( $id ); 
     
    925926 
    926927    $post_title = attribute_escape($_post->post_title); 
    927  
    928     $link_text = wp_get_attachment_image($id, $size, $icon); 
    929     if ( !$link_text ) 
     928     
     929    if ( $text ) { 
     930        $link_text = attribute_escape($text); 
     931    } elseif ( ( is_int($size) && $size != 0 ) or ( is_string($size) && $size != 'none' ) or $size != false ) { 
     932        $link_text = wp_get_attachment_image($id, $size, $icon); 
     933    } else { 
    930934        $link_text = $_post->post_title; 
    931  
     935    } 
     936     
    932937    return apply_filters( 'wp_get_attachment_link', "<a href='$url' title='$post_title'>$link_text</a>", $id, $size, $permalink, $icon ); 
    933938} 
     
    11921197    $currentf  = __( '%s [Current Revision]' ); 
    11931198 
    1194     $date = date_i18n( $datef, strtotime( $revision->post_modified ) ); 
     1199    $date = date_i18n( $datef, strtotime( $revision->post_modified_gmt . ' +0000' ) ); 
    11951200    if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) 
    11961201        $date = "<a href='$link'>$date</a>"; 
Note: See TracChangeset for help on using the changeset viewer.