diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 07:57:30 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 07:57:30 +0000 |
| commit | fa9a33d818470a5796f0ff8797f98b510ed8de18 (patch) | |
| tree | bde6a1eede376f9b5df5898ce812330152984d8e /wp-includes/comment.php | |
| parent | Releasing progress-linux version 6.4.3+dfsg1-1~progress7.99u1. (diff) | |
| download | wordpress-fa9a33d818470a5796f0ff8797f98b510ed8de18.tar.xz wordpress-fa9a33d818470a5796f0ff8797f98b510ed8de18.zip | |
Merging upstream version 6.5+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'wp-includes/comment.php')
| -rw-r--r-- | wp-includes/comment.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/wp-includes/comment.php b/wp-includes/comment.php index de23a72..cca3901 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -278,7 +278,7 @@ function get_comment_statuses() { * * @param string $post_type Optional. Post type. Default 'post'. * @param string $comment_type Optional. Comment type. Default 'comment'. - * @return string Expected return value is 'open' or 'closed'. + * @return string Either 'open' or 'closed'. */ function get_default_comment_status( $post_type = 'post', $comment_type = 'comment' ) { switch ( $comment_type ) { @@ -1031,7 +1031,7 @@ function get_comment_pages_count( $comments = null, $per_page = null, $threaded $count = ceil( count( $comments ) / $per_page ); } - return $count; + return (int) $count; } /** @@ -1170,7 +1170,7 @@ function get_page_of_comment( $comment_id, $args = array() ) { // Divide comments older than this one by comments per page to get this comment's page number. } else { - $page = ceil( ( $older_comment_count + 1 ) / $args['per_page'] ); + $page = (int) ceil( ( $older_comment_count + 1 ) / $args['per_page'] ); } } @@ -3174,10 +3174,10 @@ function privacy_ping_filter( $sites ) { * @param string $trackback_url URL to send trackbacks. * @param string $title Title of post. * @param string $excerpt Excerpt of post. - * @param int $ID Post ID. + * @param int $post_id Post ID. * @return int|false|void Database query from update. */ -function trackback( $trackback_url, $title, $excerpt, $ID ) { +function trackback( $trackback_url, $title, $excerpt, $post_id ) { global $wpdb; if ( empty( $trackback_url ) ) { @@ -3188,7 +3188,7 @@ function trackback( $trackback_url, $title, $excerpt, $ID ) { $options['timeout'] = 10; $options['body'] = array( 'title' => $title, - 'url' => get_permalink( $ID ), + 'url' => get_permalink( $post_id ), 'blog_name' => get_option( 'blogname' ), 'excerpt' => $excerpt, ); @@ -3199,8 +3199,8 @@ function trackback( $trackback_url, $title, $excerpt, $ID ) { return; } - $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID ) ); - return $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID ) ); + $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $post_id ) ); + return $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $post_id ) ); } /** |