Changeset 35379

Timestamp:

10/23/2015 09:16:30 PM (11 years ago)

Author:

SergeyBiryukov

Message:

Site Icon: Introduce get_site_icon_url filter for the icon URL.

Remove oembed_site_icon_url filter added in [34903].

Props swissspidy.
Fixes #34411.

Location:

trunk/src/wp-includes

Files:

• embed-template.php (modified) (2 diffs)
• general-template.php (modified) (1 diff)

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

@@ -124 +124 @@
                                 <div class="wp-embed-site-title">
                                         <?php
-                                        $site_icon_url = get_site_icon_url( 32, admin_url( 'images/w-logo-blue.png' ) );
-
-                                        /**
-                                         * Filters the site icon URL for use in the embed template.
-                                         *
-                                         * @since 4.4.0
-                                         *
-                                         * @param string $site_icon_url The site icon URL.
-                                         */
-                                        $site_icon_url = apply_filters( 'embed_site_icon_url', $site_icon_url );
-
                                         printf(
                                                 '<a href="%s" target="_top"><img src="%s" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>',
                                                 esc_url( home_url() ),
-                                                esc_url( $site_icon_url ),
+                                                esc_url( get_site_icon_url( 32, admin_url( 'images/w-logo-blue.png' ) ) ),
                                                 esc_attr( get_bloginfo( 'name' ) )
                                         );
@@ -225 +214 @@
                         <div class="wp-embed-site-title">
                                 <?php
-                                $site_icon_url = get_site_icon_url( 32, admin_url( 'images/w-logo-blue.png' ) );
-
-                                /**
-                                 * Filters the site icon URL for use in the embed template.
-                                 *
-                                 * @since 4.4.0
-                                 *
-                                 * @param string $site_icon_url The site icon URL.
-                                 */
-                                $site_icon_url = apply_filters( 'embed_site_icon_url', $site_icon_url );
-
                                 printf(
                                         '<a href="%s" target="_top"><img src="%s" width="32" height="32" alt="" class="wp-embed-site-icon"/><span>%s</span></a>',
                                         esc_url( home_url() ),
-                                        esc_url( $site_icon_url ),
+                                        esc_url( get_site_icon_url( 32, admin_url( 'images/w-logo-blue.png' ) ) ),
                                         esc_html( get_bloginfo( 'name' ) )
                                 );

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

@@ -777 +777 @@
         }
 
-        return $url;
+        /**
+         * Filter the site icon URL.
+         *
+         * @site 4.4.0
+         *
+         * @param string $url     Site icon URL.
+         * @param int    $size    Size of the site icon.
+         * @param int    $blog_id ID of the blog to get the site icon for.
+         */
+        return apply_filters( 'get_site_icon_url', $url, $size, $blog_id );
 }