Ticket #16434: 16434.flexibility.diff

wp-includes/general-template.php

@@ -2445 +2445 @@
  * @link http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#rel-icon HTML5 specification link icon.
  */
 function wp_site_icon() {
-        if ( ! has_site_icon() ) {
-                return;
-        }
+        $meta_tags = array();
 
-        $meta_tags = array(
-                sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( null, 32 ) ) ),
-                sprintf( '<link rel="apple-touch-icon-precomposed" href="%s">', esc_url( get_site_icon_url( null, 180 ) ) ),
-                sprintf( '<meta name="msapplication-TileImage" content="%s">', esc_url( get_site_icon_url( null, 270 ) ) ),
-        );
+        if ( has_site_icon() ) {
+                array_merge($meta_tags, array(
+                        sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( null, 32 ) ) ),
+                        sprintf( '<link rel="apple-touch-icon-precomposed" href="%s">', esc_url( get_site_icon_url( null, 180 ) ) ),
+                        sprintf( '<meta name="msapplication-TileImage" content="%s">', esc_url( get_site_icon_url( null, 270 ) ) ),
+                ));
+        }
 
         /**
          * Filters the site icon meta tags, so Plugins can add their own.