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. ?>