From 852f085d19f927678c41b4d6ebeacd1d11542fc6 Mon Sep 17 00:00:00 2001 From: John Blackbourn Date: Mon, 14 Mar 2016 22:43:27 +0000 Subject: [PATCH] Docs: The `$update_result` parameter passed to `WP_Automatic_Updater::after_core_update()` is never a `WP_Error`. If an error is returned, the error object lives in the `result` property of the paramter. See #32246 Built from https://develop.svn.wordpress.org/trunk@36995 git-svn-id: http://core.svn.wordpress.org/trunk@36962 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-upgrader.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index e7dcd64ada..246f646760 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -3171,7 +3171,7 @@ class WP_Automatic_Updater { * * @global string $wp_version * - * @param object|WP_Error $update_result The result of the core update. Includes the update offer and result. + * @param object $update_result The result of the core update. Includes the update offer and result. */ protected function after_core_update( $update_result ) { global $wp_version; diff --git a/wp-includes/version.php b/wp-includes/version.php index 791f4db1e3..66ab9504b3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.5-beta3-36994'; +$wp_version = '4.5-beta3-36995'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.