Subtitles for CPT archive issue

archive-leader.php

<?php

add_action( 'genesis_after_entry_content', 'genesis_do_post_title', 20 );
add_action( 'genesis_after_entry_content', 'ehr_do_post_subtitle', 21 );

genesis();

functions.php

<?php

add_action( 'genesis_header', 'genesis_do_post_title' );
add_action( 'genesis_header', 'ehr_do_post_subtitle' );



/**
 * Post Subtitle
 *
 * Displays the post subtitle after the title
 * @author Travis Northcutt <travis@brightagency.net>
 *
 */
function ehr_do_post_subtitle() {
  $subtitle = '';
	if (is_post_type_archive()) {
		$subtitle = apply_filters( 'ehr_post_subtitle_text', get_post_type_archive_description() );
	}

	else {
		$subtitle = apply_filters( 'ehr_post_subtitle_text', get_field('subtitle') );
	}

	if ( 0 == strlen( $subtitle ) )
		return;

	$wrap = 'span';

	$subtitle = genesis_markup( array(
								 'html5'   => "<{$wrap} %s>{$subtitle}</$wrap>",
								 'xhtml'   => sprintf( '<%s class="entry-subtitle">%s</%s>', $wrap, $subtitle, $wrap ),
								 'context' => 'entry-subtitle',
								 'echo'    => false,
							 ) );

	echo apply_filters( 'ehr_post_subtitle_output', "$subtitle \n" );
}