From a20e16d3c615591e8adf3ea09fa38a0377001abf Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Fri, 22 Jul 2016 10:43:29 +0000
Subject: [PATCH] Docs: Change type of `WP_Upgrader_Skin::$result` to
 'string|bool|WP_Error'.

`$result` can be `true` too, see `Language_Pack_Upgrader::bulk_upgrade()`.

See #32246.
Built from https://develop.svn.wordpress.org/trunk@38134


git-svn-id: http://core.svn.wordpress.org/trunk@38075 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-upgrader-skin.php | 13 ++++++++++---
 wp-includes/version.php                      |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/class-wp-upgrader-skin.php b/wp-admin/includes/class-wp-upgrader-skin.php
index 7e2411260b..518d9c1259 100644
--- a/wp-admin/includes/class-wp-upgrader-skin.php
+++ b/wp-admin/includes/class-wp-upgrader-skin.php
@@ -20,8 +20,11 @@ class WP_Upgrader_Skin {
 	public $done_footer = false;
 
 	/**
+	 * Holds the result of an upgrade.
 	 *
-	 * @var string|false|WP_Error
+	 * @since 2.8.0
+	 * @access public
+	 * @var string|bool|WP_Error
 	 */
 	public $result = false;
 	public $options = array();
@@ -51,10 +54,14 @@ class WP_Upgrader_Skin {
 	}
 
 	/**
+	 * Sets the result of an upgrade.
 	 *
-	 * @param string|false|WP_Error $result
+	 * @since 2.8.0
+	 * @access public
+	 *
+	 * @param string|bool|WP_Error $result The result of an upgrade.
 	 */
-	public function set_result($result) {
+	public function set_result( $result ) {
 		$this->result = $result;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7d7fae7042..dc2f1db6d2 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-beta4-38133';
+$wp_version = '4.6-beta4-38134';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.