Make WordPress Core


Ignore:
Timestamp:
08/10/2015 08:14:35 PM (11 years ago)
Author:
helen
Message:

Site icon: Rearrange function parameters to avoid frequently passing empty values.

props obenland.
fixes #33325.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/general-template.php

    r33229 r33605  
    725725 * Returns the Site Icon URL.
    726726 *
    727  * @param  null|int $blog_id Id of the blog to get the site icon for.
    728  * @param  int      $size    Size of the site icon.
    729  * @param  string   $url     Fallback url if no site icon is found.
    730  * @return string            Site Icon URL.
    731  */
    732 function get_site_icon_url( $blog_id = null, $size = 512, $url = '' ) {
     727 * @param  int    $size    Size of the site icon.
     728 * @param  string $url     Fallback url if no site icon is found.
     729 * @param  int    $blog_id Id of the blog to get the site icon for.
     730 * @return string          Site Icon URL.
     731 */
     732function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
    733733        if ( function_exists( 'get_blog_option' ) ) {
    734                 if ( ! is_int( $blog_id ) ) {
     734                if ( ! $blog_id ) {
    735735                        $blog_id = get_current_blog_id();
    736736                }
    … …  
    756756 * Displays the Site Icon URL.
    757757 *
    758  * @param null|int $blog_id Id of the blog to get the site icon for.
    759  * @param int      $size    Size of the site icon.
    760  * @param string   $url     Fallback url if no site icon is found.
    761  */
    762 function site_icon_url( $blog_id = null, $size = 512, $url = '' ) {
    763         echo esc_url( get_site_icon_url( $blog_id, $size, $url ) );
     758 * @param  int    $size    Size of the site icon.
     759 * @param  string $url     Fallback url if no site icon is found.
     760 * @param  int    $blog_id Id of the blog to get the site icon for.
     761 */
     762function site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
     763        echo esc_url( get_site_icon_url( $size, $url, $blog_id ) );
    764764}
    765765
    … …  
    767767 * Whether the site has a Site Icon.
    768768 *
    769  * @param int|null $blog_id Optional. Blog ID. Default: Current blog.
     769 * @param int $blog_id Optional. Blog ID. Default: Current blog.
    770770 * @return bool
    771771 */
    772 function has_site_icon( $blog_id = null ) {
    773         return !! get_site_icon_url( $blog_id, 512 );
     772function has_site_icon( $blog_id = 0 ) {
     773        return !! get_site_icon_url( 512, '', $blog_id );
    774774}
    775775
    … …  
    24512451
    24522452        $meta_tags = array(
    2453                 sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( null, 32 ) ) ),
    2454                 sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( get_site_icon_url( null, 192 ) ) ),
    2455                 sprintf( '<link rel="apple-touch-icon-precomposed" href="%s">', esc_url( get_site_icon_url( null, 180 ) ) ),
    2456                 sprintf( '<meta name="msapplication-TileImage" content="%s">', esc_url( get_site_icon_url( null, 270 ) ) ),
     2453                sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( 32 ) ) ),
     2454                sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( get_site_icon_url( 192 ) ) ),
     2455                sprintf( '<link rel="apple-touch-icon-precomposed" href="%s">', esc_url( get_site_icon_url( 180 ) ) ),
     2456                sprintf( '<meta name="msapplication-TileImage" content="%s">', esc_url( get_site_icon_url( 270 ) ) ),
    24572457        );
    24582458
Note: See TracChangeset for help on using the changeset viewer.