WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dominik Schilling 2016-07-22 10:43:29 +00:00
parent 2cbe10e79c
commit a20e16d3c6
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-admin/includes/class-wp-upgrader-skin.php
View File

@ -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;
}

2
wp-includes/version.php
View File

@ -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.