mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-01-17 21:08:44 +01:00
Code Issues Actions 99 Packages Projects Releases Wiki Activity

Site Icon: Improvements to Site Icon API.

Browse Source 
* Only call `get_blog_option()` when there is a blog id and we're in Mulitsite. If there is no blog id the request is for the current blog.
* Check return value of `wp_get_attachment_image_src()` before getting the URL since it could be `false`.
* Use `{bool}` rather than `!!` to return a boolean value.

Props MikeHansenMe, obenland.
Fixes #33326.



git-svn-id: https://develop.svn.wordpress.org/trunk@33606 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Konstantin Obenland 2015-08-11 16:24:07 +00:00
parent b9dd879f42
commit 8f37374c3d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wp-includes/general-template.php
View File

@ -730,23 +730,22 @@ function get_bloginfo( $show = '', $filter = 'raw' ) {
* @return string Site Icon URL.
*/
function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
if ( function_exists( 'get_blog_option' ) ) {
if ( ! $blog_id ) {
$blog_id = get_current_blog_id();
}
if ( $blog_id && is_multisite() ) {
$site_icon_id = get_blog_option( $blog_id, 'site_icon' );
} else {
$site_icon_id = get_option( 'site_icon' );
}
if ( $site_icon_id ) {
if ( $site_icon_id ) {
if ( $size >= 512 ) {
$size_data = 'full';
} else {
$size_data = array( $size, $size );
}
$url_data = wp_get_attachment_image_src( $site_icon_id, $size_data );
$url = $url_data[0];
if ( $url_data ) {
$url = $url_data[0];
}
}
return $url;
@ -770,7 +769,7 @@ function site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
* @return bool
*/
function has_site_icon( $blog_id = 0 ) {
return !! get_site_icon_url( 512, '', $blog_id );
return (bool) get_site_icon_url( 512, '', $blog_id );
}
/**