Include text content of style element in validation error (#3717)

* Include text content in validation error for invalid style elements * Improve presentation of text content in validation error
ampproject · Nov 12, 2019 · 835ff89 · 835ff89
1 parent b5464aa
commit 835ff89
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/includes/sanitizers/class-amp-base-sanitizer.php b/includes/sanitizers/class-amp-base-sanitizer.php
@@ -551,8 +551,8 @@ public function prepare_validation_error( array $error = [], array $data = [] )
 				}
 			}
 
-			// Capture script contents.
-			if ( 'script' === $node->nodeName && ! $node->hasAttribute( 'src' ) ) {
+			// Capture element contents.
+			if ( ( 'script' === $node->nodeName && ! $node->hasAttribute( 'src' ) ) || 'style' === $node->nodeName ) {
 				$error['text'] = $node->textContent;
 			}
 

diff --git a/includes/validation/class-amp-validation-error-taxonomy.php b/includes/validation/class-amp-validation-error-taxonomy.php
@@ -2157,6 +2157,26 @@ public static function render_single_url_error_details( $validation_error, $term
 				<dd class="detailed">
 					<?php if ( in_array( $key, [ 'node_name', 'parent_name' ], true ) ) : ?>
 						<code><?php echo esc_html( $value ); ?></code>
+					<?php elseif ( 'text' === $key ) : ?>
+						<details>
+							<summary>
+								<?php
+								echo esc_html(
+									sprintf(
+										/* translators: %s is the byte count */
+										_n(
+											'%s byte',
+											'%s bytes',
+											strlen( $value ),
+											'amp'
+										),
+										number_format_i18n( strlen( $value ) )
+									)
+								);
+								?>
+							</summary>
+							<p><code><?php echo esc_html( $value ); ?></code></p>
+						</details>
 					<?php elseif ( 'sources' === $key ) : ?>
 						<?php self::render_sources( $value ); ?>
 					<?php elseif ( $is_element_attributes ) : ?>