Changeset 33605

Timestamp:

08/10/2015 08:14:35 PM (10 years ago)

Author:

helen

Message:

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

props obenland.
fixes #33325.

Location:

trunk/src/wp-includes

Files:

• feed.php (modified) (2 diffs)
• general-template.php (modified) (4 diffs)

trunk/src/wp-includes/feed.php

@@ -561 +561 @@
  */
 function atom_site_icon() {
-    $url = get_site_icon_url( null, 32 );
+    $url = get_site_icon_url( 32 );
     if ( $url ) {
         echo "<icon>$url</icon>\n";
@@ -578 +578 @@
     }
 
-    $url = get_site_icon_url( null, 32 );
+    $url = get_site_icon_url( 32 );
     if ( $url ) {
         echo '

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

@@ -725 +725 @@
  * Returns the Site Icon URL.
  *
- * @param  null|int $blog_id Id of the blog to get the site icon for.
- * @param  int      $size    Size of the site icon.
- * @param  string   $url     Fallback url if no site icon is found.
- * @return string            Site Icon URL.
- */
-function get_site_icon_url( $blog_id = null, $size = 512, $url = '' ) {
+ * @param  int    $size    Size of the site icon.
+ * @param  string $url     Fallback url if no site icon is found.
+ * @param  int    $blog_id Id of the blog to get the site icon for.
+ * @return string          Site Icon URL.
+ */
+function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
     if ( function_exists( 'get_blog_option' ) ) {
-        if ( ! is_int( $blog_id ) ) {
+        if ( ! $blog_id ) {
             $blog_id = get_current_blog_id();
         }
@@ -756 +756 @@
  * Displays the Site Icon URL.
  *
- * @param null|int $blog_id Id of the blog to get the site icon for.
- * @param int      $size    Size of the site icon.
- * @param string   $url     Fallback url if no site icon is found.
- */
-function site_icon_url( $blog_id = null, $size = 512, $url = '' ) {
-    echo esc_url( get_site_icon_url( $blog_id, $size, $url ) );
+ * @param  int    $size    Size of the site icon.
+ * @param  string $url     Fallback url if no site icon is found.
+ * @param  int    $blog_id Id of the blog to get the site icon for.
+ */
+function site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
+    echo esc_url( get_site_icon_url( $size, $url, $blog_id ) );
 }
 
@@ -767 +767 @@
  * Whether the site has a Site Icon.
  *
- * @param int|null $blog_id Optional. Blog ID. Default: Current blog.
+ * @param int $blog_id Optional. Blog ID. Default: Current blog.
  * @return bool
  */
-function has_site_icon( $blog_id = null ) {
-    return !! get_site_icon_url( $blog_id, 512 );
+function has_site_icon( $blog_id = 0 ) {
+    return !! get_site_icon_url( 512, '', $blog_id );
 }
 
@@ -2451 +2451 @@
 
     $meta_tags = array(
-        sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( null, 32 ) ) ),
-        sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( get_site_icon_url( null, 192 ) ) ),
-        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 ) ) ),
+        sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( 32 ) ) ),
+        sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( get_site_icon_url( 192 ) ) ),
+        sprintf( '<link rel="apple-touch-icon-precomposed" href="%s">', esc_url( get_site_icon_url( 180 ) ) ),
+        sprintf( '<meta name="msapplication-TileImage" content="%s">', esc_url( get_site_icon_url( 270 ) ) ),
     );