Changeset 11599 for sites/trunk/api.wordpress.org/public_html/dotorg/trac/oembed/index.php

Timestamp:

02/24/2022 06:19:12 AM (4 years ago)

Author:

dd32

Message:

Trac: oEmbed API: Add support for /query, and fix tag removal - DomDocument returns dyamic arrays that can't be iterated while removing said elements.

File:

• sites/trunk/api.wordpress.org/public_html/dotorg/trac/oembed/index.php (modified) (5 diffs)

sites/trunk/api.wordpress.org/public_html/dotorg/trac/oembed/index.php

@@ -33 +33 @@
     // meta|core are the only tracs embedable.
     // milestone|ticketgraph|ticket|changeset are the only endpoints allowable.
-    ! preg_match( '!^(?P<baseurl>https://(?P<trac>meta|core).trac.wordpress.org/)(?P<type>milestone|ticketgraph|ticket|changeset)([/?]|$)!i', $url, $m ) ||
+    ! preg_match( '!^(?P<baseurl>https://(?P<trac>meta|core).trac.wordpress.org/)(?P<type>milestone|ticketgraph|ticket|changeset|query)([/?]|$)!i', $url, $m ) ||
     'GET' !== $_SERVER['REQUEST_METHOD']
 ) {
@@ -170 +170 @@
         }
         break;
+    case 'query':
+        $remove_tags[] = 'h1';
+        $remove_tags[] = 'h2';
+        break;
 }
 
@@ -187 +191 @@
     }
 
+    $elements_to_remove = [];
     foreach ( $doc->getElementsByTagName( $tag ) as $el ) {
         if ( $class && ! str_contains( $el->getAttribute( 'class' ), $class ) ) {
@@ -192 +197 @@
         }
 
+        $elements_to_remove[] = $el;
+    }
+
+    foreach ( $elements_to_remove as $el ) {
         $el->parentNode->removeChild( $el );
     }
@@ -227 +236 @@
 
 // Remove wp-trac.js, we don't need it here - It alters the page too much and adds elements on load.
-// Recursive as it can't iterate over the document while altering it properly.
-do {
-    $removed = 0;
-    foreach ( $doc->getElementsByTagName( 'script' ) as $script ) {
-        $src = (string) $script->getAttribute( 'src' );
-
-        if (
-            false !== stripos( $src, 'wp-trac.js' ) ||
-            false !== stripos( $script->textContent, 'wpTrac' )
-        ) {
-            $script->parentNode->removeChild( $script );
-            $removed++;
-        }
-    }
-} while ( $removed );
+$elements_to_remove = [];
+foreach ( $doc->getElementsByTagName( 'script' ) as $script ) {
+    $src = (string) $script->getAttribute( 'src' );
+
+    if (
+        false !== stripos( $src, 'wp-trac.js' ) ||
+        false !== stripos( $script->textContent, 'wpTrac' )
+    ) {
+        $elements_to_remove[] = $script;
+    }
+}
+foreach ( $elements_to_remove as $el ) {
+    $el->parentNode->removeChild( $el );
+}
 
 // Add a script to the header.