From 00388a1dbfd78ebdaaa6de91ef673768019da727 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Mon, 12 Oct 2015 23:28:24 +0000
Subject: [PATCH] Add missing `@since` params and update the docs for
 `site_icon_url()` and `has_site_icon()`.

See #32246

Built from https://develop.svn.wordpress.org/trunk@35090


git-svn-id: http://core.svn.wordpress.org/trunk@35055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 14 +++++++++-----
 wp-includes/version.php          |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index e7158b9021..f8ee2b7056 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -758,9 +758,11 @@ function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
 /**
  * Displays the Site Icon 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.
+ * @since 4.3.0
+ *
+ * @param int    $size    Optional. Size of the site icon. Default 512 (pixels).
+ * @param string $url     Optional. Fallback url if no site icon is found. Default empty.
+ * @param int    $blog_id Optional. ID of the blog to get the site icon for. Default current blog.
  */
 function site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
 	echo esc_url( get_site_icon_url( $size, $url, $blog_id ) );
@@ -769,8 +771,10 @@ function site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
 /**
  * Whether the site has a Site Icon.
  *
- * @param int $blog_id Optional. Blog ID. Default: Current blog.
- * @return bool
+ * @since 4.3.0
+ *
+ * @param int $blog_id Optional. ID of the blog in question. Default current blog.
+ * @return bool Whether the site has a site icon or not.
  */
 function has_site_icon( $blog_id = 0 ) {
 	return (bool) get_site_icon_url( 512, '', $blog_id );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1ed09563a9..2a0a1078b4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35089';
+$wp_version = '4.4-alpha-35090';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.