Merge branch 'master' of https://github.com/davidakennedy/_s into titles

Conflicts:
	image.php
	inc/custom-header.php
	searchform.php
This commit is contained in:
obenland 2013-09-25 14:59:11 -07:00
commit 543cae8bbf
7 changed files with 14 additions and 19 deletions

View file

@ -6,7 +6,7 @@
* You can add an optional custom header image to header.php like so ...
<?php if ( get_header_image() ) : ?>
<a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
<a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home">
<img src="<?php header_image(); ?>" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="">
</a>
<?php endif; // End header image check. ?>

View file

@ -159,9 +159,8 @@ function _s_the_attached_image() {
$next_attachment_url = get_attachment_link( array_shift( $attachment_ids ) );
}
printf( '<a href="%1$s" title="%2$s" rel="attachment">%3$s</a>',
printf( '<a href="%1$s" rel="attachment">%2$s</a>',
esc_url( $next_attachment_url ),
the_title_attribute( array( 'echo' => false ) ),
wp_get_attachment_image( $post->ID, $attachment_size )
);
}
@ -184,14 +183,12 @@ function _s_posted_on() {
);
printf( __( '<span class="posted-on">Posted on %1$s</span><span class="byline"> by %2$s</span>', '_s' ),
sprintf( '<a href="%1$s" title="%2$s" rel="bookmark">%3$s</a>',
sprintf( '<a href="%1$s" rel="bookmark">%2$s</a>',
esc_url( get_permalink() ),
esc_attr( get_the_time() ),
$time_string
),
sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s">%3$s</a></span>',
sprintf( '<span class="author vcard"><a class="url fn n" href="%1$s">%2$s</a></span>',
esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
esc_attr( sprintf( __( 'View all posts by %s', '_s' ), get_the_author() ) ),
esc_html( get_the_author() )
)
);