Changeset 28882

Timestamp:

06/28/2014 04:15:30 AM (10 years ago)

Author:

wonderboymusic

Message:

wp_extract_urls() should not match dates.

Updates unit tests.

Props hinnerk, sergej.mueller.
Fixes #28222.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/functions.php (modified) (7 diffs)

trunk/src/wp-includes/functions.php

@@ -442 +442 @@
 function wp_extract_urls( $content ) {
     preg_match_all(
-        "#((?:[\w-]+://?|[\w\d]+[.])[^\s()<>]+[.](?:\([\w\d]+\)|(?:[^`!()\[\]{};:'\".,<>?«»“”‘’\s]|(?:[:]\d+)?/?)+))#",
+        "#("
+            . "(?: ([\w-]+:)?//? )"
+            . "[^\s()<>]+"
+            . "[.]"
+            . "(?:"
+                . "\([\w\d]+\) |"
+                . "(?:"
+                    . "[^`!()\[\]{};:'\".,<>?«»“”‘’\s] |"
+                    . "(?: [:]\d+ )?/?"
+                . ")+"
+            . ")"
+        . ")#x",
         $content,
         $post_links

trunk/tests/phpunit/tests/functions.php

@@ -371 +371 @@
             'http://woo.com/1,2,3,4,5,6/-1-2-3-4-/woo.html',
             'http://this.com',
+            'http://127.0.0.1',
             'http://www111.urwyeoweytwutreyytqytwetowteuiiu.com/?346236346326&2134362574863.437',
             'http://wordpress-core/1,2,3,4,5,6/-1-2-3-4-/woo.html',
@@ -420 +421 @@
             'http://türkiye.icom.museum',
             'http://украина.icom.museum',
-            'http://việtnam.icom.museum'
+            'http://việtnam.icom.museum',
+            'ftp://127.0.0.1/'
         );
 
@@ -427 +429 @@
 
             http://this.com
+
+            http://127.0.0.1
 
             http://www111.urwyeoweytwutreyytqytwetowteuiiu.com/?346236346326&2134362574863.437
@@ -477 +481 @@
             http://украина.icom.museum
             http://việtnam.icom.museum
+            ftp://127.0.0.1/
         ";
 
@@ -494 +499 @@
         $blob ="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
             incididunt ut labore http://woo.com/1,2,3,4,5,6/-1-2-3-4-/woo.html et dolore magna aliqua.
-            Ut http://this.com enim ad minim veniam, quis nostrud exercitation ullamco
+            Ut http://this.com enim ad minim veniam, quis nostrud exercitation 16.06. to 18.06.2014 ullamco http://127.0.0.1
             laboris nisi ut aliquip ex http://www111.urwyeoweytwutreyytqytwetowteuiiu.com/?346236346326&2134362574863.437 ea
             commodo consequat. http://wordpress-core/1,2,3,4,5,6/-1-2-3-4-/woo.html Duis aute irure dolor in reprehenderit in voluptate
@@ -503 +508 @@
         $this->assertNotEmpty( $urls );
         $this->assertInternalType( 'array', $urls );
-        $this->assertCount( 7, $urls );
-        $this->assertEquals( array_slice( $original_urls, 0, 7 ), $urls );
+        $this->assertCount( 8, $urls );
+        $this->assertEquals( array_slice( $original_urls, 0, 8 ), $urls );
 
         $blob = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor
             incididunt ut labore <a href="http://woo.com/1,2,3,4,5,6/-1-2-3-4-/woo.html">343462^</a> et dolore magna aliqua.
-            Ut <a href="http://this.com">&amp;3640i6p1yi499</a> enim ad minim veniam, quis nostrud exercitation ullamco
+            Ut <a href="http://this.com">&amp;3640i6p1yi499</a> enim ad minim veniam, quis nostrud exercitation 16.06. to 18.06.2014 ullamco <a href="http://127.0.0.1">localhost</a>
             laboris nisi ut aliquip ex <a href="http://www111.urwyeoweytwutreyytqytwetowteuiiu.com/?346236346326&amp;2134362574863.437">343462^</a> ea
             commodo consequat. <a href="http://wordpress-core/1,2,3,4,5,6/-1-2-3-4-/woo.html">343462^</a> Duis aute irure dolor in reprehenderit in voluptate
@@ -517 +522 @@
         $this->assertNotEmpty( $urls );
         $this->assertInternalType( 'array', $urls );
-        $this->assertCount( 7, $urls );
-        $this->assertEquals( array_slice( $original_urls, 0, 7 ), $urls );
+        $this->assertCount( 8, $urls );
+        $this->assertEquals( array_slice( $original_urls, 0, 8 ), $urls );
     }
 }