Ensure AMP is not available for disabled posts in Reader mode #4209
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In Reader mode, when a post has AMP disabled due to post type being unsupported, "AMP Enabled" toggled off, or `amp_skip_post` filters false: * Prevent including the amphtml link to the AMP version. * Redirect AMP URLs to the corresponding non-AMP URL.
|
Hi @westonruter, |
kienstra
approved these changes
Feb 3, 2020
There was a problem hiding this comment.
Looks Good!
Hi @westonruter,
Sorry for the delay.
Like you mentioned, this fixes the issue of the amphtml link being present, and it now redirects to the non-AMP URL:
| && | ||
| $has_query_var | ||
| && | ||
| ( ! is_singular() || ! post_supports_amp( get_post( get_queried_object_id() ) ) ) |
There was a problem hiding this comment.
Good idea to check that post_supports_amp().
Co-Authored-By: Ryan Kienstra <kienstraryan@gmail.com>
|
Verified in QA |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
This fixes a regression introduced in #3781 (for #2202) and a condition missed in #4184. In Reader mode, when a post has AMP disabled due to post type being unsupported, "AMP Enabled" toggled off, or
amp_skip_postfilters false:In Reader mode, previously if you had created a post and AMP was not available for it (e.g. by toggling off “Enable AMP”):
The
amphtmllink would unexpectedly be still added to the page (whereas in Transitional mode it would be correctly omitted):And the AMP version would be accessible (unlike Transitional mode):
This PR corrects those to defects in Reader mode: the
link[amphtml]element is omitted and direct access to the AMP endpoint will redirect to the non-AMP version.Checklist