Use template_dir consistently as signal for Transitional mode #3286
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
An issue reported by @archon810 was that if if a theme contains a theme support declaration like the following:
The theme support option in the admin will default to Standard when first activating the plugin, as opposed to the Transitional mode, which is what is implied by supplying
template_dir
withoutpaired
. This is shown inamp_is_canonical()
:amp-wp/amp.php
Lines 600 to 601 in 93276f7
The issue is that this same logic is not being used
AMP_Theme_Support::read_theme_support()
:amp-wp/includes/class-amp-theme-support.php
Line 321 in 93276f7
This is something that was likely missed in #2550.
So this PR ensures that
AMP_Theme_Support::read_theme_support()
results in the same theme support being derived as is indicated byamp_is_canonical()
.To test this PR:
add_theme_support()
to a theme'sfunctions.php
wp option delete amp-options
.