Skip to content

Rename WP_Theme::is_block_based to WP_Theme::is_block_theme and wp_is_block_template_theme to wp_is_block_theme #2014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anton-vlasenko wants to merge 6 commits into from
Closed

Rename WP_Theme::is_block_based to WP_Theme::is_block_theme and wp_is_block_template_theme to wp_is_block_theme #2014

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
450c03d
Rename wp_is_block_template_theme to wp_is_block_theme.
anton-vlasenko Dec 6, 2021
ed79860
Rename WP_Theme::is_block_based to wp_is_block_theme.
anton-vlasenko Dec 6, 2021
09d4062
Use wp_get_theme()->is_block_theme() inside the wp_is_block_theme fun…
anton-vlasenko Dec 6, 2021
591267f
Small change.
anton-vlasenko Dec 6, 2021
24ae6ca
Revert "Small change."
anton-vlasenko Dec 6, 2021
66e9013
Refactor the test as suggested here: https://github.com/WordPress/wor…
anton-vlasenko Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use wp_get_theme()->is_block_theme() inside the wp_is_block_theme fun… 
…ction.

See the discussion here: https://core.trac.wordpress.org/ticket/54552
  • Loading branch information
@anton-vlasenko
anton-vlasenko committed Dec 6, 2021
commit 09d406230dde56eade1c2f27879e73f8cd7ac006
3 changes: 1 addition & 2 deletions src/wp-includes/theme.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4091,6 +4091,5 @@ function create_initial_theme_features() {
* @return boolean Whether the current theme is a block-based theme or not.
*/
function wp_is_block_theme() {
Copy link
Contributor

@hellofromtonya hellofromtonya Dec 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@anton-vlasenko As Gutenberg has to support WP 5.7 and 5.8, how will renaming this function impact the plugin? Are you planning to rename it in Gutenberg too and deprecate the original name? Or does renaming not affect Gutenberg?

Copy link
Contributor

@costdev costdev Dec 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hellofromtonya Companion issue is here and the PR for that issue seems to have been updated in line with this page.

Copy link
Contributor

@hellofromtonya hellofromtonya Dec 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @costdev for pointing that out.

Copy link
Author

@anton-vlasenko anton-vlasenko Dec 6, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hellofromtonya
Yes, I'm planning to rename it in Gutenberg. I've created a PR that renames it.
IMO it doesn't make sense to keep both wp_is_block_theme and wp_is_block_template_theme functions in WordPress Core.
I think we still have time to rename it in Gutenberg before the Gutenberg 12.1.0 release.

Copy link
Contributor

@hellofromtonya hellofromtonya Dec 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @anton-vlasenko. Part of the consolidation discuss is to help with the backports from Gutenberg to Core. So wanted to make sure whatever happens here also happens in the Gutenberg repo too, i.e. code matches.

Copy link
Author

@anton-vlasenko anton-vlasenko Dec 6, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for making sure, @hellofromtonya.
I 100% agree.
We need to be careful to make sure we don't break Gutenberg.

return is_readable( get_theme_file_path( '/block-templates/index.html' ) ) ||
is_readable( get_theme_file_path( '/templates/index.html' ) );
return wp_get_theme()->is_block_theme();
}