Changeset 33606 for trunk/src/wp-includes/general-template.php

Timestamp:

08/11/2015 04:24:07 PM (9 years ago)

Author:

obenland

Message:

Site Icon: Improvements to Site Icon API.

• 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.

File:

• trunk/src/wp-includes/general-template.php (modified) (4 diffs)

trunk/src/wp-includes/general-template.php

@@ -731 +731 @@
  */
 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 {
@@ -740 +737 @@
     }
 
-    if ( $site_icon_id  ) {
+    if ( $site_icon_id ) {
         if ( $size >= 512 ) {
             $size_data = 'full';
@@ -747 +744 @@
         }
         $url_data = wp_get_attachment_image_src( $site_icon_id, $size_data );
-        $url = $url_data[0];
+        if ( $url_data ) {
+            $url = $url_data[0];
+        }
     }
 
@@ -771 +770 @@
  */
 function has_site_icon( $blog_id = 0 ) {
-    return !! get_site_icon_url( 512, '', $blog_id );
+    return (bool) get_site_icon_url( 512, '', $blog_id );
 }