Return secondary amp mode if this post/page is a web story. #3619
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
aaemnnosttv
reviewed
Jun 23, 2021
aaemnnosttv
reviewed
Jun 23, 2021
includes/Context.php
Outdated
Comment on lines
327
to
332
| // If the AMP plugin isn't enabled but this page/post is a web | ||
| // story, use AMP Secondary mode. | ||
| if ( is_singular( 'web-story' ) ) { | ||
| return self::AMP_MODE_SECONDARY; | ||
| } | ||
|
|
There was a problem hiding this comment.
This doesn't need to be conditional based on the AMP plugin, this should simply go before AMP plugin checks here like it does in the is_amp() method above.
felixarntz
requested changes
Jun 28, 2021
includes/Context.php
Outdated
| @@ -324,6 +324,12 @@ public function is_amp() { | |||
| */ | |||
| public function get_amp_mode() { | |||
| if ( ! class_exists( 'AMP_Theme_Support' ) ) { | |||
| // If the AMP plugin isn't enabled but this page/post is a web | |||
| // story, use AMP Secondary mode. | |||
| if ( is_singular( 'web-story' ) ) { | |||
There was a problem hiding this comment.
@tofumatt In addition to @aaemnnosttv's comment, per #2998 (comment) this shouldn't check whether the current context is a web story (which will never be the case in WP Admin), instead it needs to check whether the Web Stories plugin is active (e.g. check for whether the WEBSTORIES_VERSION constant is defined (see https://github.com/google/web-stories-wp/blob/main/web-stories.php).
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
Addresses issue #2998.
Checklist