From d1c09d96bfc87567d84266c570fa1cbb530dd3f6 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Sun, 8 Nov 2015 01:59:26 +0000 Subject: [PATCH] Site Icon: Use new `wp_get_attachment_image_url()` to retrieve URL. `wp_get_attachment_image_url()` is a nice replacement for `wp_get_attachment_image_src()` here after its introduction in 4.4. Props imath. See #34312. Built from https://develop.svn.wordpress.org/trunk@35571 git-svn-id: http://core.svn.wordpress.org/trunk@35535 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/general-template.php | 5 +---- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 90b7a7d1ea..05b86f2c11 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -770,10 +770,7 @@ function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) { } else { $size_data = array( $size, $size ); } - $url_data = wp_get_attachment_image_src( $site_icon_id, $size_data ); - if ( $url_data ) { - $url = $url_data[0]; - } + $url = wp_get_attachment_image_url( $site_icon_id, $size_data ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 38b66c1aba..787fa3f6b4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-beta3-35570'; +$wp_version = '4.4-beta3-35571'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.