Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 06:57:35 +01:00
Code Issues Projects Releases Wiki Activity

Posts, Post Types: Remove redundant function calls in get_body_class().

Browse Source 
As part of a previous change to add support for post type templates, the `$wp_query->get_queried_object_id()` method ended up being called twice, in both the `is_singular()` and `is_page()` conditional branches.

The `get_post()` function call was also unnecessary, as `$wp_query->get_queried_object()` is already called in the `is_singular()` branch above, which includes the `is_page()` branch too.

This commit removes the redundant calls. The first `$wp_query->get_queried_object_id()` call is removed as well, since the post ID is already available via `$wp_query->get_queried_object()`.

Follow-up to [10485], [10877], [12877], [13032], [21597], [38951].

Props mattkeys, spacedmonkey, oglekler.
Fixes #43661.
Built from https://develop.svn.wordpress.org/trunk@56424


git-svn-id: http://core.svn.wordpress.org/trunk@55936 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2023-08-22 12:30:29 +00:00
parent 87aa505a94
commit 106404bcbd
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/post-template.php
View File

@ -670,8 +670,8 @@ function get_body_class( $css_class = '' ) {
} }
if ( is_singular() ) { if ( is_singular() ) {
$post_id = $wp_query->get_queried_object_id();
$post = $wp_query->get_queried_object(); $post = $wp_query->get_queried_object();
$post_id = $post->ID;
$post_type = $post->post_type; $post_type = $post->post_type;
if ( is_page_template() ) { if ( is_page_template() ) {
@ -714,16 +714,11 @@ function get_body_class( $css_class = '' ) {
$classes[] = 'attachment-' . str_replace( $mime_prefix, '', $mime_type ); $classes[] = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
} elseif ( is_page() ) { } elseif ( is_page() ) {
$classes[] = 'page'; $classes[] = 'page';
$classes[] = 'page-id-' . $post_id;
$page_id = $wp_query->get_queried_object_id();
$post = get_post( $page_id );
$classes[] = 'page-id-' . $page_id;
if ( get_pages( if ( get_pages(
array( array(
'parent' => $page_id, 'parent' => $post_id,
'number' => 1, 'number' => 1,
) )
) ) { ) ) {

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.4-alpha-56422'; $wp_version = '6.4-alpha-56424';
/** /**
* 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.