diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 1eb420c4c7..ae86f60f45 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -1015,9 +1015,11 @@ class Plugin_Upgrader extends WP_Upgrader { * Hooked to the {@see 'upgrader_pre_install'} filter by {@see Plugin_Upgrader::upgrade()}. * * @since 2.8.0 + * @since 4.1.0 Added a return value. * - * @param bool|WP_Error $return Upgrade offer return. - * @param array $plugin Plugin package arguments. + * @param bool|WP_Error $return Upgrade offer return. + * @param array $plugin Plugin package arguments. + * @return bool|WP_Error The passed in $return param or {@see WP_Error}. */ public function deactivate_plugin_before_upgrade($return, $plugin) { diff --git a/wp-includes/version.php b/wp-includes/version.php index b4d4f09ff6..a3e6c7c9e1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30761'; +$wp_version = '4.1-beta2-30762'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.