Fix preview of published post in reader mode#4663
Closed
ktmn wants to merge 1 commit intoampproject:developfrom
Closed
Fix preview of published post in reader mode#4663ktmn wants to merge 1 commit intoampproject:developfrom
ktmn wants to merge 1 commit intoampproject:developfrom
Conversation
|
Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). 📝 Please visit https://cla.developers.google.com/ to sign. Once you've signed (or fixed any issues), please reply here with What to do if you already signed the CLAIndividual signers
Corporate signers
ℹ️ Googlers: Go here for more info. |
pierlon
suggested changes
May 6, 2020
| case 'post': | ||
| return get_post( $this->ID ); | ||
| $post = get_post( $this->ID ); | ||
| if ( isset( $_GET['preview_id'] ) && isset( $_GET['preview_nonce'] ) ) { |
Contributor
There was a problem hiding this comment.
Suggested change
| if ( isset( $_GET['preview_id'] ) && isset( $_GET['preview_nonce'] ) ) { | |
| if ( isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) { |
| $post = get_post( $this->ID ); | ||
| if ( isset( $_GET['preview_id'] ) && isset( $_GET['preview_nonce'] ) ) { | ||
| $id = (int) $_GET['preview_id']; | ||
| if( wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) { |
Contributor
There was a problem hiding this comment.
Suggested change
| if( wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) { | |
| if ( wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) { |
Contributor
|
@ktmn also, don't forget to sign the CLA, as outlined in #4663 (comment). |
westonruter
requested changes
May 6, 2020
Member
westonruter
left a comment
There was a problem hiding this comment.
After digging into this, I found an alternative solution that I think will be more robust. All we need to do is pass in the initial $post when constructing the AMP_Post_Template and use it from then on. It will have the_preview applied already, so we don't need to call it manually:
--- a/includes/templates/class-amp-post-template.php
+++ b/includes/templates/class-amp-post-template.php
@@ -66,6 +66,13 @@ class AMP_Post_Template {
*/
public $ID;
+ /**
+ * Post
+ *
+ * @var WP_Post
+ */
+ public $post;
+
/**
* AMP_Post_Template constructor.
*
@@ -73,9 +80,11 @@ class AMP_Post_Template {
*/
public function __construct( $post ) {
if ( is_int( $post ) ) {
- $this->ID = $post;
+ $this->ID = $post;
+ $this->post = get_post( $post );
} elseif ( $post instanceof WP_Post ) {
- $this->ID = $post->ID;
+ $this->ID = $post->ID;
+ $this->post = $post;
}
}
@@ -151,22 +160,6 @@ class AMP_Post_Template {
$this->data = apply_filters( 'amp_post_template_data', $this->data, $this->post );
}
- /**
- * Getter.
- *
- * @since 1.5
- *
- * @param string $name Property name.
- * @return mixed
- */
- public function __get( $name ) {
- switch ( $name ) {
- case 'post':
- return get_post( $this->ID );
- }
- return null;
- }
-
/**
* Get template directory for Reader mode.
*
diff --git a/includes/templates/reader-template-loader.php b/includes/templates/reader-template-loader.php
index d518343dc..5833bc9ba 100644
--- a/includes/templates/reader-template-loader.php
+++ b/includes/templates/reader-template-loader.php
@@ -32,5 +32,5 @@ do_action( 'pre_amp_render_post', get_queried_object_id() );
require_once AMP__DIR__ . '/includes/amp-post-template-functions.php';
amp_post_template_init_hooks();
-$amp_post_template = new AMP_Post_Template( get_queried_object_id() );
+$amp_post_template = new AMP_Post_Template( $post );
$amp_post_template->load();
Author
|
@westonruter Yeah that makes sense, go with that. |
3 tasks
Member
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Addresses #4656