WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Twenty Thirteen: Clean up image attachment template and move logic to `twentythirteen_the_attached_image()` function. Props obenland, fixes #24479. 

git-svn-id: http://core.svn.wordpress.org/trunk@24402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Lance Willett 2013-06-03 21:44:25 +00:00
parent 90ce925c46
commit e5b9b98c46
2 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
wp-content/themes/twentythirteen/functions.php
View File

@ -420,6 +420,59 @@ function twentythirteen_entry_date( $echo = true ) {
}
endif;
if ( ! function_exists( 'twentythirteen_the_attached_image' ) ) :
/**
* Prints the attached image with a link to the next attached image.
*
* @since Twenty Thirteen 1.0
*
* @return void
*/
function twentythirteen_the_attached_image() {
$post = get_post();
$attachment_size = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) );
$next_attachment_url = wp_get_attachment_url();
/**
* Grab the IDs of all the image attachments in a gallery so we can get the URL
* of the next adjacent image in a gallery, or the first image (if we're
* looking at the last image in a gallery), or, in a gallery of one, just the
* link to that image file.
*/
$attachments = array_values( get_children( array(
'post_parent' => $post->post_parent,
'post_status' => 'inherit',
'post_type' => 'attachment',
'post_mime_type' => 'image',
'order' => 'ASC',
'orderby' => 'menu_order ID'
) ) );
// If there is more than 1 attachment in a gallery...
if ( count( $attachments ) > 1 ) {
foreach ( $attachments as $k => $attachment ) {
if ( $attachment->ID == $post->ID )
break;
}
$k++;
// get the URL of the next image attachment...
if ( isset( $attachments[ $k ] ) )
$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
// or get the URL of the first image attachment.
else
$next_attachment_url = get_attachment_link( $attachments[0]->ID );
}
printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
esc_url( $next_attachment_url ),
the_title_attribute( array( 'echo' => false ) ),
wp_get_attachment_image( $post->ID, $attachment_size )
);
}
endif;
/**
* Returns the URL from the post.
*

51
wp-content/themes/twentythirteen/image.php
View File

@ -9,41 +9,6 @@
* @since Twenty Thirteen 1.0
*/
the_post();
/**
* Grab the IDs of all the image attachments in a gallery so we can get the URL of the next adjacent image in a gallery,
* or the first image (if we're looking at the last image in a gallery), or, in a gallery of one, just the link to that image file
*/
$attachments = array_values( get_children( array(
'post_parent' => $post->post_parent,
'post_status' => 'inherit',
'post_type' => 'attachment',
'post_mime_type' => 'image',
'order' => 'ASC',
'orderby' => 'menu_order ID'
) ) );
foreach ( $attachments as $k => $attachment ) :
if ( $attachment->ID == $post->ID )
break;
endforeach;
$k++;
// If there is more than 1 attachment in a gallery
if ( count( $attachments ) > 1 ) :
if ( isset( $attachments[ $k ] ) ) :
// get the URL of the next image attachment
$next_attachment_url = get_attachment_link( $attachments[ $k ]->ID );
else :
// or get the URL of the first image attachment
$next_attachment_url = get_attachment_link( $attachments[ 0 ]->ID );
endif;
else :
// or, if there's only 1 image, get the URL of the image
$next_attachment_url = wp_get_attachment_url();
endif;
get_header(); ?>
<div id="primary" class="content-area">
@ -54,10 +19,10 @@ get_header(); ?>
<div class="entry-meta">
<?php
$published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
$published_text = __( '<span class="attachment-meta">Published on <time class="entry-date" datetime="%1$s">%2$s</time> in <a href="%3$s" title="Return to %4$s" rel="gallery">%5$s</a></span>', 'twentythirteen' );
$post_title = get_the_title( $post->post_parent );
if ( empty( $post_title ) || 0 == $post->post_parent )
$published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';
$published_text = '<span class="attachment-meta"><time class="entry-date" datetime="%1$s">%2$s</time></span>';
printf( $published_text,
esc_attr( get_the_date( 'c' ) ),
@ -76,7 +41,8 @@ get_header(); ?>
$metadata['height']
);
edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' ); ?>
edit_post_link( __( 'Edit', 'twentythirteen' ), '<span class="edit-link">', '</span>' );
?>
</div><!-- .entry-meta -->
</header><!-- .entry-header -->
@ -88,18 +54,14 @@ get_header(); ?>
<div class="entry-attachment">
<div class="attachment">
<a href="<?php echo esc_url( $next_attachment_url ); ?>" title="<?php the_title_attribute(); ?>" rel="attachment"><?php
$attachment_size = apply_filters( 'twentythirteen_attachment_size', array( 724, 724 ) );
echo wp_get_attachment_image( $post->ID, $attachment_size );
?></a>
<?php twentythirteen_the_attached_image(); ?>
<?php if ( ! empty( $post->post_excerpt ) ) : ?>
<?php if ( has_excerpt() ) : ?>
<div class="entry-caption">
<?php the_excerpt(); ?>
</div>
<?php endif; ?>
</div><!-- .attachment -->
</div><!-- .entry-attachment -->
<?php if ( ! empty( $post->post_content ) ) : ?>
@ -110,7 +72,6 @@ get_header(); ?>
<?php endif; ?>
</div><!-- .entry-content -->
</article><!-- #post -->
<?php comments_template(); ?>