Twitter Cards: fallback if there is no existing image card

jeherve · jeherve · commit c8700e644377 · 2014-11-08T11:15:29.000Z
diff --git a/class.jetpack-twitter-cards.php b/class.jetpack-twitter-cards.php
@@ -133,12 +133,12 @@ static function twitter_cards_define_type_based_on_image_count( $og_tags, $extra
 			}
 
 			// Second fall back, Site Logo
-			if ( empty( $img_count ) && ( function_exists( 'jetpack_has_site_logo' ) && jetpack_has_site_logo() ) ) {
+			if ( empty( $og_tags['twitter:image'] ) && ( function_exists( 'jetpack_has_site_logo' ) && jetpack_has_site_logo() ) ) {
 				$og_tags['twitter:image'] = jetpack_get_site_logo( 'url' );
 			}
 
 			// Third fall back, Site Icon
-			if ( empty( $img_count ) && ( function_exists( 'jetpack_has_site_icon' ) && jetpack_has_site_icon() ) ) {
+			if ( empty( $og_tags['twitter:image'] ) && ( function_exists( 'jetpack_has_site_icon' ) && jetpack_has_site_icon() ) ) {
 				$og_tags['twitter:image'] = jetpack_site_icon_url( '240' );
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -133,12 +133,12 @@ static function twitter_cards_define_type_based_on_image_count( $og_tags, $extra`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`// Second fall back, Site Logo`
`136`		`- if ( empty( $img_count ) && ( function_exists( 'jetpack_has_site_logo' ) && jetpack_has_site_logo() ) ) {`
	`136`	`+ if ( empty( $og_tags['twitter:image'] ) && ( function_exists( 'jetpack_has_site_logo' ) && jetpack_has_site_logo() ) ) {`
`137`	`137`	`$og_tags['twitter:image'] = jetpack_get_site_logo( 'url' );`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`// Third fall back, Site Icon`
`141`		`- if ( empty( $img_count ) && ( function_exists( 'jetpack_has_site_icon' ) && jetpack_has_site_icon() ) ) {`
	`141`	`+ if ( empty( $og_tags['twitter:image'] ) && ( function_exists( 'jetpack_has_site_icon' ) && jetpack_has_site_icon() ) ) {`
`142`	`142`	`$og_tags['twitter:image'] = jetpack_site_icon_url( '240' );`
`143`	`143`	`}`
`144`	`144`