Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move any content output during shutdown to be injected before closing body tag #1102

Merged
merged 2 commits into from
Jun 20, 2018
Merged

Move any content output during shutdown to be injected before closing body tag #1102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82b7687
Move any content output during shutdown to be injected before closing…
westonruter Apr 29, 2018
b5948c5
Move trailing content after </html> to be placed before the </body>
westonruter Jun 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions includes/class-amp-theme-support.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,22 @@ public static function prepare_response( $response, $args = array() ) {
$dom = AMP_DOM_Utils::get_dom( $response );
$head = $dom->getElementsByTagName( 'head' )->item( 0 );

// Move anything after </html>, such as Query Monitor output added at shutdown, to be moved before </body>.
$body = $dom->getElementsByTagName( 'body' )->item( 0 );
if ( $body ) {
while ( $dom->documentElement->nextSibling ) {
// Trailing elements after </html> will get wrapped in additional <html> elements.
if ( 'html' === $dom->documentElement->nextSibling->nodeName ) {
while ( $dom->documentElement->nextSibling->firstChild ) {
$body->appendChild( $dom->documentElement->nextSibling->firstChild );
}
$dom->removeChild( $dom->documentElement->nextSibling );
} else {
$body->appendChild( $dom->documentElement->nextSibling );
}
}
}

// Make sure scripts from the body get moved to the head.
if ( isset( $head ) ) {
$xpath = new DOMXPath( $dom );
Expand Down
9 changes: 8 additions & 1 deletion tests/test-class-amp-theme-support.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,7 @@ public function test_prepare_response() {
<?php wp_head(); ?>
<script data-head>document.write('Illegal');</script>
</head>
<body>
<body><!-- </body></html> -->
<img width="100" height="100" src="https://example.com/test.png">
<audio width="400" height="300" src="https://example.com/audios/myaudio.mp3"></audio>
<amp-ad type="a9"
Expand All @@ -1111,13 +1111,17 @@ public function test_prepare_response() {
data-aax_size="300x250"
data-aax_pubname="test123"
data-aax_src="302"></amp-ad>

<?php wp_footer(); ?>

<button onclick="alert('Illegal');">no-onclick</button>

<style>body { background: black; }</style>
</body>
</html>
<!--comment-after-html-->
<div id="after-html"></div>
<!--comment-end-html-->
<?php
$original_html = trim( ob_get_clean() );
$sanitized_html = AMP_Theme_Support::prepare_response( $original_html );
Expand Down Expand Up @@ -1165,6 +1169,9 @@ public function test_prepare_response() {
$removed_nodes
);

// Make sure trailing content after </html> gets moved.
$this->assertRegExp( '#<!--comment-after-html-->\s*<div id="after-html"></div>\s*<!--comment-end-html-->\s*</body>\s*</html>\s*$#s', $sanitized_html );

$prepare_response_args = array(
'enable_response_caching' => true,
);
Expand Down