Find META tag with HTML Tag Processor instead of RegExp

Automattic · Oct 25, 2023 · bb0245c · bb0245c
1 parent 4580d14
commit bb0245c
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php b/projects/plugins/jetpack/_inc/lib/core-api/class.jetpack-core-api-module-endpoints.php
@@ -797,14 +797,21 @@ public function update_data( $request ) {
 				case 'pinterest':
 				case 'yandex':
 				case 'facebook':
-					$grouped_options_current = (array) get_option( 'verification_services_codes' );
-					$grouped_options         = $grouped_options_current;
+					$grouped_options_current    = (array) get_option( 'verification_services_codes' );
+					$grouped_options            = $grouped_options_current;
+					$grouped_options[ $option ] = $value;
 
 					// Extracts the content attribute from the HTML meta tag if needed.
-					if ( preg_match( '#.*<meta name="(?:[^"]+)" content="([^"]+)" />.*#i', $value, $matches ) ) {
-						$grouped_options[ $option ] = $matches[1];
-					} else {
-						$grouped_options[ $option ] = $value;
+					$processor = new WP_HTML_Tag_Processor( $value );
+					while ( $processor->next_tag() ) {
+						if ( 'META' === $processor->get_tag() && null !== $processor->get_attribute( 'name' ) ) {
+							$grouped_options[ $option ] = $processor->get_attribute( 'content' );
+							break;
+						}
+
+						if ( 'BODY' === $processor->get_tag() ) {
+							break;
+						}
 					}
 
 					// If option value was the same, consider it done.