Changeset 29756

Timestamp:

09/23/2014 02:49:22 AM (10 years ago)

Author:

wonderboymusic

Message:

wp_extract_urls() needs to also grab URLs with query strings and hashes.

Updates unit test.

Props hauvong, dlh.
Fixes #29314.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/tests/functions.php (modified) (2 diffs)

trunk/src/wp-includes/functions.php

@@ -458 +458 @@
 function wp_extract_urls( $content ) {
     preg_match_all(
-        "#("
+        "#([\"']?)("
             . "(?:([\w-]+:)?//?)"
             . "[^\s()<>]+"
@@ -465 +465 @@
                 . "\([\w\d]+\)|"
                 . "(?:"
-                    . "[^`!()\[\]{};:'\".,<>?«»“”‘’\s]|"
+                    . "[^`!()\[\]{};:'\".,<>«»“”‘’\s]|"
                     . "(?:[:]\d+)?/?"
                 . ")+"
             . ")"
-        . ")#",
+        . ")\\1#",
         $content,
         $post_links
     );
 
-    $post_links = array_unique( array_map( 'html_entity_decode', $post_links[0] ) );
+    $post_links = array_unique( array_map( 'html_entity_decode', $post_links[2] ) );
 
     return array_values( $post_links );

trunk/tests/phpunit/tests/functions.php

@@ -422 +422 @@
             'http://украина.icom.museum',
             'http://việtnam.icom.museum',
-            'ftp://127.0.0.1/'
+            'ftp://127.0.0.1/',
+            'http://www.woo.com/video?v=exvUH2qKLTU',
+            'http://taco.com?burrito=enchilada#guac'
         );
 
@@ -482 +484 @@
             http://việtnam.icom.museum
             ftp://127.0.0.1/
+            http://www.woo.com/video?v=exvUH2qKLTU
+
+            http://taco.com?burrito=enchilada#guac
         ";