From 52d2b076002027e211eac13ccc5b3d26eb26f1e9 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 8 Dec 2020 11:51:05 +0000 Subject: [PATCH] Docs: Fix typo in references to `WP_Error` in some DocBlocks. See #51800. Built from https://develop.svn.wordpress.org/trunk@49769 git-svn-id: http://core.svn.wordpress.org/trunk@49492 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/media.php | 11 ++++++----- wp-includes/taxonomy.php | 8 ++++---- wp-includes/version.php | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/wp-includes/media.php b/wp-includes/media.php index e651dcbccf..b219ab0ff2 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -3505,7 +3505,8 @@ function is_gd_image( $image ) { * * @param int $width Image width in pixels. * @param int $height Image height in pixels. - * @return resource|GdImage|false The GD image resource or GdImage instance on success. False on failure. + * @return resource|GdImage|false The GD image resource or GdImage instance on success. + * False on failure. */ function wp_imagecreatetruecolor( $width, $height ) { $img = imagecreatetruecolor( $width, $height ); @@ -3578,8 +3579,8 @@ function wp_max_upload_size() { * @param string $path Path to the file to load. * @param array $args Optional. Additional arguments for retrieving the image editor. * Default empty array. - * @return WP_Image_Editor|WP_Error The WP_Image_Editor object if successful, an WP_Error - * object otherwise. + * @return WP_Image_Editor|WP_Error The WP_Image_Editor object on success, + * a WP_Error object otherwise. */ function wp_get_image_editor( $path, $args = array() ) { $args['path'] = $path; @@ -3630,8 +3631,8 @@ function wp_image_editor_supports( $args = array() ) { * @since 3.5.0 * * @param array $args Optional. Array of arguments for choosing a capable editor. Default empty array. - * @return string|false Class name for the first editor that claims to support the request. False if no - * editor claims to support the request. + * @return string|false Class name for the first editor that claims to support the request. + * False if no editor claims to support the request. */ function _wp_image_editor_choose( $args = array() ) { require_once ABSPATH . WPINC . '/class-wp-image-editor.php'; diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index e9d7ff1065..c3decccf49 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -724,10 +724,10 @@ function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) { /** * Retrieve object_ids of valid taxonomy and term. * - * The strings of $taxonomies must exist before this function will continue. On - * failure of finding a valid taxonomy, it will return an WP_Error class, kind - * of like Exceptions in PHP 5, except you can't catch them. Even so, you can - * still test for the WP_Error class and get the error message. + * The strings of $taxonomies must exist before this function will continue. + * On failure of finding a valid taxonomy, it will return a WP_Error class, + * kind of like Exceptions in PHP 5, except you can't catch them. Even so, + * you can still test for the WP_Error class and get the error message. * * The $terms aren't checked the same as $taxonomies, but still need to exist * for $object_ids to be returned. diff --git a/wp-includes/version.php b/wp-includes/version.php index 1174e18373..aa2b45ffd1 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.7-alpha-49764'; +$wp_version = '5.7-alpha-49769'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.