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

Coding Standards: Use strict comparison in `wp-includes/class-wp-theme.php`. 

Follow-up to [20029], [20119], [20144].

Props aristath, poena, afercia, SergeyBiryukov.
See #60700.
Built from https://develop.svn.wordpress.org/trunk@57847


git-svn-id: http://core.svn.wordpress.org/trunk@57348 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2024-03-16 13:18:15 +00:00
parent c6c7d5080a
commit a0f10b0742
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/class-wp-theme.php
View File

@ -352,7 +352,7 @@ final class WP_Theme implements ArrayAccess {
*/ */
$default_theme_slug = array_search( $this->headers['Name'], self::$default_themes, true ); $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes, true );
if ( $default_theme_slug ) { if ( $default_theme_slug ) {
if ( basename( $this->stylesheet ) != $default_theme_slug ) { if ( basename( $this->stylesheet ) !== $default_theme_slug ) {
$this->headers['Name'] .= '/' . $this->stylesheet; $this->headers['Name'] .= '/' . $this->stylesheet;
} }
} }
@ -417,7 +417,10 @@ final class WP_Theme implements ArrayAccess {
} }
// If we got our data from cache, we can assume that 'template' is pointing to the right place. // If we got our data from cache, we can assume that 'template' is pointing to the right place.
if ( ! is_array( $cache ) && $this->template != $this->stylesheet && ! file_exists( $this->theme_root . '/' . $this->template . '/index.php' ) ) { if ( ! is_array( $cache )
&& $this->template !== $this->stylesheet
&& ! file_exists( $this->theme_root . '/' . $this->template . '/index.php' )
) {
/* /*
* If we're in a directory of themes inside /themes, look for the parent nearby. * If we're in a directory of themes inside /themes, look for the parent nearby.
* wp-content/themes/directory-of-themes/* * wp-content/themes/directory-of-themes/*
@ -425,7 +428,9 @@ final class WP_Theme implements ArrayAccess {
$parent_dir = dirname( $this->stylesheet ); $parent_dir = dirname( $this->stylesheet );
$directories = search_theme_directories(); $directories = search_theme_directories();
if ( '.' !== $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) { if ( '.' !== $parent_dir
&& file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' )
) {
$this->template = $parent_dir . '/' . $this->template; $this->template = $parent_dir . '/' . $this->template;
} elseif ( $directories && isset( $directories[ $this->template ] ) ) { } elseif ( $directories && isset( $directories[ $this->template ] ) ) {
/* /*
@ -460,9 +465,9 @@ final class WP_Theme implements ArrayAccess {
} }
// Set the parent, if we're a child theme. // Set the parent, if we're a child theme.
if ( $this->template != $this->stylesheet ) { if ( $this->template !== $this->stylesheet ) {
// If we are a parent, then there is a problem. Only two generations allowed! Cancel things out. // If we are a parent, then there is a problem. Only two generations allowed! Cancel things out.
if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) { if ( $_child instanceof WP_Theme && $_child->template === $this->stylesheet ) {
$_child->parent = null; $_child->parent = null;
$_child->errors = new WP_Error( $_child->errors = new WP_Error(
'theme_parent_invalid', 'theme_parent_invalid',
@ -484,7 +489,7 @@ final class WP_Theme implements ArrayAccess {
) )
); );
// The two themes actually reference each other with the Template header. // The two themes actually reference each other with the Template header.
if ( $_child->stylesheet == $this->template ) { if ( $_child->stylesheet === $this->template ) {
$this->errors = new WP_Error( $this->errors = new WP_Error(
'theme_parent_invalid', 'theme_parent_invalid',
sprintf( sprintf(
@ -1714,7 +1719,7 @@ final class WP_Theme implements ArrayAccess {
return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id ); return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id );
} }
$current = get_current_blog_id() == $blog_id; $current = get_current_blog_id() === $blog_id;
if ( $current ) { if ( $current ) {
$allowed_themes[ $blog_id ] = get_option( 'allowedthemes' ); $allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.6-alpha-57845'; $wp_version = '6.6-alpha-57847';
/** /**
* 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.