From 3c8ae810184a31ba668c6eee9918a7b2486c4d4a Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 4 Mar 2018 19:50:31 +0000 Subject: [PATCH] Docs: Clarify `download_url()` return value, improve DocBlock formatting. See #42505. Built from https://develop.svn.wordpress.org/trunk@42775 git-svn-id: http://core.svn.wordpress.org/trunk@42605 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/file.php | 11 ++++++----- wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 2f90b74dbd..ee0536e647 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -958,14 +958,15 @@ function wp_handle_sideload( &$file, $overrides = false, $time = null ) { /** - * Downloads a URL to a local temporary file using the WordPress HTTP Class. - * Please note, That the calling function must unlink() the file. + * Downloads a URL to a local temporary file using the WordPress HTTP API. + * + * Please note that the calling function must unlink() the file. * * @since 2.5.0 * - * @param string $url the URL of the file to download - * @param int $timeout The timeout for the request to download the file default 300 seconds - * @return mixed WP_Error on failure, string Filename on success. + * @param string $url The URL of the file to download. + * @param int $timeout The timeout for the request to download the file. Default 300 seconds. + * @return string|WP_Error Filename on success, WP_Error on failure. */ function download_url( $url, $timeout = 300 ) { //WARNING: The file is not automatically deleted, The script must unlink() the file. diff --git a/wp-includes/version.php b/wp-includes/version.php index 6622cde77a..071abd19f9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-42774'; +$wp_version = '5.0-alpha-42775'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.