Merge pull request #102 from Kit/use-domdocument-body-html

n7studios · web-flow · commit 5c4f94eee2c2 · 2025-09-17T10:26:59.000+08:00
Use DOMDocument for returning &lt;body&gt; HTML
diff --git a/src/class-convertkit-api-traits.php b/src/class-convertkit-api-traits.php
@@ -1773,6 +1773,9 @@ public function convert_script_type(\DOMNodeList $elements)
      */
     public function strip_html_head_body_tags(string $markup)
     {
+        // Mark as deprecated in 2.1.0.
+        _deprecated_function( __FUNCTION__, '2.1.0', 'get_body_html()' );
+        
         $markup = str_replace('<html>', '', $markup);
         $markup = str_replace('</html>', '', $markup);
         $markup = str_replace('<head>', '', $markup);
@@ -1784,6 +1787,28 @@ public function strip_html_head_body_tags(string $markup)
         return $markup;
     }
 
+    /**
+	 * Returns the HTML within the DOMDocument's <body> tag as a string.
+	 *
+	 * @param \DOMDocument $dom DOM Document.
+	 * 
+	 * @since   2.1.0
+	 *
+	 * @return  string
+	 */
+	public function get_body_html(\DOMDocument $dom) {
+
+		$body = $dom->getElementsByTagName( 'body' )->item( 0 );
+
+		$html = '';
+		foreach ( $body->childNodes as $child ) { // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+			$html .= $dom->saveHTML( $child );
+		}
+
+		return $html;
+
+	}
+
     /**
      * Adds total count and pagination parameters to the given array of existing API parameters.
      *
diff --git a/src/class-convertkit-api-v4.php b/src/class-convertkit-api-v4.php
@@ -1251,10 +1251,8 @@ public function get_html( $url, $body_only = true ) {
 			return $html->saveHTML();
 		}
 
-		// Remove some HTML tags that DOMDocument adds, returning the output.
-		// We do this instead of using LIBXML_HTML_NOIMPLIED in loadHTML(), because Legacy Forms are not always contained in
-		// a single root / outer element, which is required for LIBXML_HTML_NOIMPLIED to correctly work.
-		return $this->strip_html_head_body_tags( $html->saveHTML() );
+		// Return the HTML within the DOMDocument's <body> tag as a string.
+		return $this->get_body_html( $html );
 
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1251,10 +1251,8 @@ public function get_html( $url, $body_only = true ) {`
`1251`	`1251`	`return $html->saveHTML();`
`1252`	`1252`	`}`
`1253`	`1253`
`1254`		`- // Remove some HTML tags that DOMDocument adds, returning the output.`
`1255`		`- // We do this instead of using LIBXML_HTML_NOIMPLIED in loadHTML(), because Legacy Forms are not always contained in`
`1256`		`- // a single root / outer element, which is required for LIBXML_HTML_NOIMPLIED to correctly work.`
`1257`		`- return $this->strip_html_head_body_tags( $html->saveHTML() );`
	`1254`	`+ // Return the HTML within the DOMDocument's <body> tag as a string.`
	`1255`	`+ return $this->get_body_html( $html );`
`1258`	`1256`
`1259`	`1257`	`}`
`1260`	`1258`