Move any content output during shutdown to be injected before closing body tag #1102
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
commented
Apr 29, 2018
includes/class-amp-theme-support.php
Outdated
| @@ -1043,6 +1043,10 @@ public static function prepare_response( $response, $args = array() ) { | |||
| 1 | |||
| ); | |||
| } | |||
|
|
|||
| // Move anything after </html>, such as Query Monitor output added at shutdown, to be moved before </body>. | |||
| $response = preg_replace( '#(</body>.*</html>)(.+)#s', '$2$1', $response ); | |||
There was a problem hiding this comment.
Warning: If there is something like <!-- </body></html> --> in the body then this will break. It would be better to use the DOM to move the content since we're parsing it below anyway. We can just move any siblings after the following siblings of $dom->documentElement to be added under the body element.
westonruter
force-pushed
the
fix/incorporate-shutdown-output
branch
from
2f2a315 to
c360ddc
Compare
westonruter
changed the title
westonruter
force-pushed
the
fix/incorporate-shutdown-output
branch
from
c360ddc to
b5948c5
Compare
kienstra
approved these changes
Jun 20, 2018
There was a problem hiding this comment.
Approved
Hi @westonruter,
This PR looks good. As expected, it moves the #query-monitor element to the end of <body> .
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.
Plugins like Query Monitor output content at
shutdown. This means the output is added after the</html>closing tag. The AMP plugin currently only sanitizes and outputs the contents of thehtmlelement. In order to ensure that content after the closing HTML tag is sanitized and incorporated (“embodied”) into the document, we should consider moving the trailing content to be injected before the</body>tag.