Target embeds already wrapped in a <p> tag

Author: pierlon

includes/embeds/class-amp-facebook-embed-handler.php

@@ -112,8 +112,8 @@ public function render( $args ) {
 	 * @param Document $dom DOM.
 	 */
 	public function sanitize_raw_embeds( Document $dom ) {
-		$embed_nodes = $dom->getElementsByTagName( $this->amp_tag );
-
+		// If there were any previous embeds in the DOM that were wrapped by `wpautop()`, unwrap them.
+		$embed_nodes = $dom->xpath->query( "//p/{$this->amp_tag}" );
 		if ( $embed_nodes->length ) {
 			foreach ( $embed_nodes as $embed_node ) {
 				$this->unwrap_p_element( $embed_node );