Site Icon: add missing parameter to jetpack_site_icon_url

jeherve · jeherve · commit a75cc2a2a221 · 2014-12-03T21:24:52.000+01:00
See Automattic#1280 (comment)
diff --git a/class.jetpack-twitter-cards.php b/class.jetpack-twitter-cards.php
@@ -139,7 +139,7 @@ static function twitter_cards_define_type_based_on_image_count( $og_tags, $extra
 
 			// Third fall back, 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' );
+				$og_tags['twitter:image'] = jetpack_site_icon_url( null, '240' );
 			}
 
 			// Not falling back on Gravatar, because there's no way to know if we end up with an auto-generated one.
diff --git a/functions.opengraph.php b/functions.opengraph.php
@@ -207,7 +207,7 @@ function jetpack_og_get_image( $width = 200, $height = 200, $max_images = 4 ) {
 
 	// Third fall back, Site Icon
 	if ( empty( $image ) && ( function_exists( 'jetpack_has_site_icon' ) && jetpack_has_site_icon() ) ) {
-		$image[] = jetpack_site_icon_url( '512' );
+		$image[] = jetpack_site_icon_url( null, '512' );
 	}
 
 	// Fourth fall back, blank image

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ static function twitter_cards_define_type_based_on_image_count( $og_tags, $extra`
`139`	`139`
`140`	`140`	`// Third fall back, Site Icon`
`141`	`141`	`if ( empty( $og_tags['twitter:image'] ) && ( function_exists( 'jetpack_has_site_icon' ) && jetpack_has_site_icon() ) ) {`
`142`		`- $og_tags['twitter:image'] = jetpack_site_icon_url( '240' );`
	`142`	`+ $og_tags['twitter:image'] = jetpack_site_icon_url( null, '240' );`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`// Not falling back on Gravatar, because there's no way to know if we end up with an auto-generated one.`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ function jetpack_og_get_image( $width = 200, $height = 200, $max_images = 4 ) {`
`207`	`207`
`208`	`208`	`// Third fall back, Site Icon`
`209`	`209`	`if ( empty( $image ) && ( function_exists( 'jetpack_has_site_icon' ) && jetpack_has_site_icon() ) ) {`
`210`		`- $image[] = jetpack_site_icon_url( '512' );`
	`210`	`+ $image[] = jetpack_site_icon_url( null, '512' );`
`211`	`211`	`}`
`212`	`212`
`213`	`213`	`// Fourth fall back, blank image`