From fcd674ca6c6dc26509c710b2996b304352340db6 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Mon, 18 Jan 2016 02:59:27 +0000
Subject: [PATCH] Docs: Fix type documentation for `WP_Network` properties.

* `$cookie_domain` was incorrectly documented as an `int`.
* `$id` and `$blog_id`, though numeric, are provided as strings and should be documented as such.

Fixes #35404.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-network.php | 10 +++++++---
 wp-includes/version.php          |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/wp-includes/class-wp-network.php b/wp-includes/class-wp-network.php
index 0ccafafd1c..529c73f3b7 100644
--- a/wp-includes/class-wp-network.php
+++ b/wp-includes/class-wp-network.php
@@ -23,9 +23,11 @@ class WP_Network {
 	/**
 	 * Network ID.
 	 *
+	 * A numeric string, for compatibility reasons.
+	 *
 	 * @since 4.4.0
 	 * @access public
-	 * @var int
+	 * @var string
 	 */
 	public $id;
 
@@ -53,9 +55,11 @@ class WP_Network {
 	 * Named "blog" vs. "site" for legacy reasons. A main site is mapped to
 	 * the network when the network is created.
 	 *
+	 * A numeric string, for compatibility reasons.
+	 *
 	 * @since 4.4.0
 	 * @access public
-	 * @var int
+	 * @var string
 	 */
 	public $blog_id = 0;
 
@@ -64,7 +68,7 @@ class WP_Network {
 	 *
 	 * @since 4.4.0
 	 * @access public
-	 * @var int
+	 * @var string
 	 */
 	public $cookie_domain = '';
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0043600c1a..70574c585d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-1453085412976';
+$wp_version = '4.5-alpha-1453085953122';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.