WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2020-12-08 11:51:05 +00:00
parent efdba220e6
commit 52d2b07600
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/media.php
View File

@ -3505,7 +3505,8 @@ function is_gd_image( $image ) {
* *
* @param int $width Image width in pixels. * @param int $width Image width in pixels.
* @param int $height Image height 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 ) { function wp_imagecreatetruecolor( $width, $height ) {
$img = 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 string $path Path to the file to load.
* @param array $args Optional. Additional arguments for retrieving the image editor. * @param array $args Optional. Additional arguments for retrieving the image editor.
* Default empty array. * Default empty array.
* @return WP_Image_Editor|WP_Error The WP_Image_Editor object if successful, an WP_Error * @return WP_Image_Editor|WP_Error The WP_Image_Editor object on success,
* object otherwise. * a WP_Error object otherwise.
*/ */
function wp_get_image_editor( $path, $args = array() ) { function wp_get_image_editor( $path, $args = array() ) {
$args['path'] = $path; $args['path'] = $path;
@ -3630,8 +3631,8 @@ function wp_image_editor_supports( $args = array() ) {
* @since 3.5.0 * @since 3.5.0
* *
* @param array $args Optional. Array of arguments for choosing a capable editor. Default empty array. * @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 * @return string|false Class name for the first editor that claims to support the request.
* editor claims to support the request. * False if no editor claims to support the request.
*/ */
function _wp_image_editor_choose( $args = array() ) { function _wp_image_editor_choose( $args = array() ) {
require_once ABSPATH . WPINC . '/class-wp-image-editor.php'; require_once ABSPATH . WPINC . '/class-wp-image-editor.php';

8
wp-includes/taxonomy.php
View File

@ -724,10 +724,10 @@ function unregister_taxonomy_for_object_type( $taxonomy, $object_type ) {
/** /**
* Retrieve object_ids of valid taxonomy and term. * Retrieve object_ids of valid taxonomy and term.
* *
* The strings of $taxonomies must exist before this function will continue. On * The strings of $taxonomies must exist before this function will continue.
* failure of finding a valid taxonomy, it will return an WP_Error class, kind * On failure of finding a valid taxonomy, it will return a WP_Error class,
* of like Exceptions in PHP 5, except you can't catch them. Even so, you can * kind of like Exceptions in PHP 5, except you can't catch them. Even so,
* still test for the WP_Error class and get the error message. * 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 * The $terms aren't checked the same as $taxonomies, but still need to exist
* for $object_ids to be returned. * for $object_ids to be returned.

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.