From 3385d5b2de03b3dc98eea2ba28f6624b2010a317 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 4 Mar 2018 22:07:29 +0000 Subject: [PATCH] Docs: Expand `delete_theme()` return value, fix typo in `delete_plugins()` return value. See #42505. Built from https://develop.svn.wordpress.org/trunk@42778 git-svn-id: http://core.svn.wordpress.org/trunk@42608 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/plugin.php | 2 +- wp-admin/includes/theme.php | 7 ++++--- wp-includes/version.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index a20c93dfa6..84bb3d82a4 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -816,7 +816,7 @@ function activate_plugins( $plugins, $redirect = '', $network_wide = false, $sil * * @param array $plugins List of plugins to delete. * @param string $deprecated Deprecated. - * @return bool|null|WP_Error True on success, false is $plugins is empty, WP_Error on failure. + * @return bool|null|WP_Error True on success, false if `$plugins` is empty, WP_Error on failure. * Null if filesystem credentials are required to proceed. */ function delete_plugins( $plugins, $deprecated = '' ) { diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index 69ae209648..a9b4cdd02b 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -13,9 +13,10 @@ * * @global WP_Filesystem_Base $wp_filesystem WordPress filesystem subclass. * - * @param string $stylesheet Stylesheet of the theme to delete - * @param string $redirect Redirect to page when complete. - * @return void|bool|WP_Error When void, echoes content. + * @param string $stylesheet Stylesheet of the theme to delete. + * @param string $redirect Redirect to page when complete. + * @return bool|null|WP_Error True on success, false if `$stylesheet` is empty, WP_Error on failure. + * Null if filesystem credentials are required to proceed. */ function delete_theme( $stylesheet, $redirect = '' ) { global $wp_filesystem; diff --git a/wp-includes/version.php b/wp-includes/version.php index 6d1ec887ba..fc0079dc49 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-42777'; +$wp_version = '5.0-alpha-42778'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.