Changeset 53044 for trunk/src/wp-includes/functions.php

Timestamp:

04/01/2022 03:38:55 AM (3 years ago)

Author:

peterwilsoncc

Message:

Formatting: Account for HTML entities in wp_extract_urls().

Prevent wp_extract_urls() trimming HTML entities within URLs. Correctly escaped URLs such as ​https://youtube.com/watch?v=dQw4w9WgXcQ&t=1 will now be extracted as ​https://youtube.com/watch?v=dQw4w9WgXcQ&t=1 rather than truncated.

Props trex005, voldemortensen, johnbillion, ironprogrammer, costdev, hellofromtonya.
Fixes #30580

File:

• trunk/src/wp-includes/functions.php (modified) (3 diffs)

trunk/src/wp-includes/functions.php

@@ -821 +821 @@
  *
  * @since 3.7.0
+ * @since 6.0.0 Fixes support for HTML entities (Trac 30580).
  *
  * @param string $content Content to extract URLs from.
@@ -834 +835 @@
                 . '\([\w\d]+\)|'
                 . '(?:'
-                    . "[^`!()\[\]{};:'\".,<>«»“”‘’\s]|"
+                    . "[^`!()\[\]{}:'\".,<>«»“”‘’\s]|"
                     . '(?:[:]\d+)?/?'
                 . ')+'
@@ -843 +844 @@
     );
 
-    $post_links = array_unique( array_map( 'html_entity_decode', $post_links[2] ) );
+    $post_links = array_unique(
+        array_map(
+            static function( $link ) {
+                // Decode to replace valid entities, like &amp;.
+                $link = html_entity_decode( $link );
+                // Maintain backward compatibility by removing extraneous semi-colons (`;`).
+                return str_replace( ';', '', $link );
+            },
+            $post_links[2]
+        )
+    );
 
     return array_values( $post_links );