Add AMP on protected posts #3697
Merged
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
westonruter
reviewed
Nov 8, 2019
| $errors[] = 'password-protected'; | ||
| // Show password form instead of the post content. | ||
| if ( ! current_theme_supports( 'amp' ) && post_password_required( $post ) ) { | ||
| add_filter( 'the_content', [ __CLASS__, 'show_password_form' ] ); |
There was a problem hiding this comment.
I don't think this isn't really the right place for this filter to be added. Adding a filter is introducing global side effects which don't seem necessarily expected.
There was a problem hiding this comment.
I think this can be simplified quite a bit: 8519e4b
There was a problem hiding this comment.
Ah, that is indeed a much better solution. Thanks 👌
westonruter
reviewed
Nov 8, 2019
| @@ -322,7 +322,7 @@ private function build_post_comments_data() { | |||
| */ | |||
| private function build_post_content() { | |||
| $amp_content = new AMP_Content( | |||
| $this->post->post_content, | |||
| post_password_required( $this->post ) ? get_the_password_form( $this->post ) : $this->post->post_content, | |||
There was a problem hiding this comment.
This is now somewhat like what get_the_content() is doing:
// If post password required and it doesn't match the cookie.
if ( post_password_required( $_post ) ) {
return get_the_password_form( $_post );
}
|
Thanks for simplifying the password form logic, @westonruter. |
westonruter
approved these changes
Nov 8, 2019
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
Fixes #3428.
Checklist