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

Docs: Correct inline comment formatting in `redirect_canonical()`. 

Follow-up to [57357].

See #61608.
Built from https://develop.svn.wordpress.org/trunk@58924


git-svn-id: http://core.svn.wordpress.org/trunk@58320 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-08-22 23:47:15 +00:00
parent 78a0c7a5b3
commit 83c2045588
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/canonical.php
View File

@ -553,16 +553,17 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
$attachment_id = get_query_var( 'attachment_id' ); $attachment_id = get_query_var( 'attachment_id' );
$attachment_post = get_post( $attachment_id ); $attachment_post = get_post( $attachment_id );
$attachment_parent_id = $attachment_post ? $attachment_post->post_parent : 0; $attachment_parent_id = $attachment_post ? $attachment_post->post_parent : 0;
$attachment_url = wp_get_attachment_url( $attachment_id );
$attachment_url = wp_get_attachment_url( $attachment_id );
if ( $attachment_url !== $redirect_url ) { if ( $attachment_url !== $redirect_url ) {
/* /*
* If an attachment is attached to a post, it inherits the parent post's status. Fetch the * If an attachment is attached to a post, it inherits the parent post's status.
* parent post to check its status later. * Fetch the parent post to check its status later.
*/ */
if ( $attachment_parent_id ) { if ( $attachment_parent_id ) {
$redirect_obj = get_post( $attachment_parent_id ); $redirect_obj = get_post( $attachment_parent_id );
} }
$redirect_url = $attachment_url; $redirect_url = $attachment_url;
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.7-alpha-58923'; $wp_version = '6.7-alpha-58924';
/** /**
* 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.