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

Comments: Restore the fourth parameter of `comments_number()` as `$post_id`, for consistency with `get_comments_number_text()`. 

The parameter was previously used as the number of comments, marked as deprecated in [5101].

Given that it's been deprecated for the last 13 years, it should be safe to undeprecate and repurpose it for a cleaner function signature, instead of adding a fifth parameter.

Follow-up to [47276].

Fixes #48772.
Built from https://develop.svn.wordpress.org/trunk@47366


git-svn-id: http://core.svn.wordpress.org/trunk@47153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-02-25 17:34:08 +00:00
parent b7c69ce058
commit 5308f570cb
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/comment-template.php
View File

@ -870,18 +870,14 @@ function get_comments_number( $post_id = 0 ) {
* Displays the language string for the number of comments the current post has. * Displays the language string for the number of comments the current post has.
* *
* @since 0.71 * @since 0.71
* @since 5.4.0 Added the `$post_id` parameter. * @since 5.4.0 The `$deprecated` parameter was changed to `$post_id`.
* *
* @param string $zero Optional. Text for no comments. Default false. * @param string $zero Optional. Text for no comments. Default false.
* @param string $one Optional. Text for one comment. Default false. * @param string $one Optional. Text for one comment. Default false.
* @param string $more Optional. Text for more than one comment. Default false. * @param string $more Optional. Text for more than one comment. Default false.
* @param string $deprecated Not used.
* @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is the global `$post`. * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is the global `$post`.
*/ */
function comments_number( $zero = false, $one = false, $more = false, $deprecated = '', $post_id = 0 ) { function comments_number( $zero = false, $one = false, $more = false, $post_id = 0 ) {
if ( ! empty( $deprecated ) ) {
_deprecated_argument( __FUNCTION__, '1.3.0' );
}
echo get_comments_number_text( $zero, $one, $more, $post_id ); echo get_comments_number_text( $zero, $one, $more, $post_id );
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-beta2-47365'; $wp_version = '5.4-beta2-47366';
/** /**
* 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.