From f14f6a162aaabc32f4ffcebcedc31987468383bb Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 19 Jul 2022 14:02:10 +0000 Subject: [PATCH] Coding Standards: Improve variable names in `wp-trackback.php`. This fixes a `Variable "$comment_post_ID" is not in valid snake_case format` WPCS warning. `$comment_post_ID`, while matching the database field of the same name, does not follow the WordPress coding standards, so the variable is now renamed to `$comment_post_id`. Additionally, these variables are renamed for clarity: * `$tb_id` to `$post_id` (this was not the trackback ID) * `$tb_url` to `$trackback_url` Follow-up to [172], [637], [1616], See #55647, #56244. Built from https://develop.svn.wordpress.org/trunk@53719 git-svn-id: http://core.svn.wordpress.org/trunk@53278 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/comment-template.php | 8 ++--- wp-includes/version.php | 2 +- wp-trackback.php | 61 +++++++++++++++++++++----------- 3 files changed, 45 insertions(+), 26 deletions(-) diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 424e97c5bb..c1eacd7a6f 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -1146,9 +1146,9 @@ function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt */ function get_trackback_url() { if ( get_option( 'permalink_structure' ) ) { - $tb_url = trailingslashit( get_permalink() ) . user_trailingslashit( 'trackback', 'single_trackback' ); + $trackback_url = trailingslashit( get_permalink() ) . user_trailingslashit( 'trackback', 'single_trackback' ); } else { - $tb_url = get_option( 'siteurl' ) . '/wp-trackback.php?p=' . get_the_ID(); + $trackback_url = get_option( 'siteurl' ) . '/wp-trackback.php?p=' . get_the_ID(); } /** @@ -1156,9 +1156,9 @@ function get_trackback_url() { * * @since 2.2.0 * - * @param string $tb_url The trackback URL. + * @param string $trackback_url The trackback URL. */ - return apply_filters( 'trackback_url', $tb_url ); + return apply_filters( 'trackback_url', $trackback_url ); } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 9402535d0a..8ac2e7ca08 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-53718'; +$wp_version = '6.1-alpha-53719'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-trackback.php b/wp-trackback.php index 7da8cdd16f..41b215b658 100644 --- a/wp-trackback.php +++ b/wp-trackback.php @@ -26,6 +26,7 @@ if ( empty( $wp ) ) { */ function trackback_response( $error = 0, $error_message = '' ) { header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) ); + if ( $error ) { echo '\n"; echo "\n"; @@ -45,12 +46,12 @@ function trackback_response( $error = 0, $error_message = '' ) { $request_array = 'HTTP_POST_VARS'; if ( ! isset( $_GET['tb_id'] ) || ! $_GET['tb_id'] ) { - $tb_id = explode( '/', $_SERVER['REQUEST_URI'] ); - $tb_id = (int) $tb_id[ count( $tb_id ) - 1 ]; + $post_id = explode( '/', $_SERVER['REQUEST_URI'] ); + $post_id = (int) $post_id[ count( $post_id ) - 1 ]; } -$tb_url = isset( $_POST['url'] ) ? $_POST['url'] : ''; -$charset = isset( $_POST['charset'] ) ? $_POST['charset'] : ''; +$trackback_url = isset( $_POST['url'] ) ? $_POST['url'] : ''; +$charset = isset( $_POST['charset'] ) ? $_POST['charset'] : ''; // These three are stripslashed here so they can be properly escaped after mb_convert_encoding(). $title = isset( $_POST['title'] ) ? wp_unslash( $_POST['title'] ) : ''; @@ -81,56 +82,73 @@ $excerpt = wp_slash( $excerpt ); $blog_name = wp_slash( $blog_name ); if ( is_single() || is_page() ) { - $tb_id = $posts[0]->ID; + $post_id = $posts[0]->ID; } -if ( ! isset( $tb_id ) || ! (int) $tb_id ) { +if ( ! isset( $post_id ) || ! (int) $post_id ) { trackback_response( 1, __( 'I really need an ID for this to work.' ) ); } -if ( empty( $title ) && empty( $tb_url ) && empty( $blog_name ) ) { +if ( empty( $title ) && empty( $trackback_url ) && empty( $blog_name ) ) { // If it doesn't look like a trackback at all. - wp_redirect( get_permalink( $tb_id ) ); + wp_redirect( get_permalink( $post_id ) ); exit; } -if ( ! empty( $tb_url ) && ! empty( $title ) ) { +if ( ! empty( $trackback_url ) && ! empty( $title ) ) { /** * Fires before the trackback is added to a post. * * @since 4.7.0 * - * @param int $tb_id Post ID related to the trackback. - * @param string $tb_url Trackback URL. - * @param string $charset Character Set. - * @param string $title Trackback Title. - * @param string $excerpt Trackback Excerpt. - * @param string $blog_name Blog Name. + * @param int $post_id Post ID related to the trackback. + * @param string $trackback_url Trackback URL. + * @param string $charset Character set. + * @param string $title Trackback title. + * @param string $excerpt Trackback excerpt. + * @param string $blog_name Blog name. */ - do_action( 'pre_trackback_post', $tb_id, $tb_url, $charset, $title, $excerpt, $blog_name ); + do_action( 'pre_trackback_post', $post_id, $trackback_url, $charset, $title, $excerpt, $blog_name ); header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) ); - if ( ! pings_open( $tb_id ) ) { + if ( ! pings_open( $post_id ) ) { trackback_response( 1, __( 'Sorry, trackbacks are closed for this item.' ) ); } $title = wp_html_excerpt( $title, 250, '…' ); $excerpt = wp_html_excerpt( $excerpt, 252, '…' ); - $comment_post_ID = (int) $tb_id; + $comment_post_id = (int) $post_id; $comment_author = $blog_name; $comment_author_email = ''; - $comment_author_url = $tb_url; + $comment_author_url = $trackback_url; $comment_content = "$title\n\n$excerpt"; $comment_type = 'trackback'; - $dupe = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", $comment_post_ID, $comment_author_url ) ); + $dupe = $wpdb->get_results( + $wpdb->prepare( + "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_author_url = %s", + $comment_post_id, + $comment_author_url + ) + ); + if ( $dupe ) { trackback_response( 1, __( 'There is already a ping from that URL for this post.' ) ); } - $commentdata = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type' ); + $commentdata = array( + 'comment_post_ID' => $comment_post_id, + ); + + $commentdata += compact( + 'comment_author', + 'comment_author_email', + 'comment_author_url', + 'comment_content', + 'comment_type' + ); $result = wp_new_comment( $commentdata ); @@ -148,5 +166,6 @@ if ( ! empty( $tb_url ) && ! empty( $title ) ) { * @param int $trackback_id Trackback ID. */ do_action( 'trackback_post', $trackback_id ); + trackback_response( 0 ); }