Changeset 59143

Timestamp:

09/30/2024 11:27:34 PM (9 months ago)

Author:

peterwilsoncc

Message:

Formatting: Improve parenthesis handling in make_clickable().

Improve the regular expression for making links clickable to account for parenthesis in links containing an extension, for example: http://wordpress.org/my-image(2).jpg.

Props coquardcyr, hellofromtonya, parthvataliya, rhellewellgmailcom.
Fixes #62037.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/makeClickable.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -2944 +2944 @@
     }
 
+    if ( isset( $matches[4] ) && ! empty( $matches[4] ) ) {
+        $url .= $matches[4];
+    }
+
     // Include parentheses in the URL only if paired.
     while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
@@ -3116 +3120 @@
                 )
                 (\)?)                                          # 3: Trailing closing parenthesis (for parenthesis balancing post processing).
+                (\\.\\w{2,6})?                                 # 4: Allowing file extensions (e.g., .jpg, .png).
             ~xS';
             /*

trunk/tests/phpunit/tests/formatting/makeClickable.php

@@ -246 +246 @@
             ),
 
+            // @ticket #62037
+            'URL with brackets in path before the extension' => array(
+                'text'     => 'http://example-image(2).jpg',
+                'expected' => '<a href="http://example-image(2).jpg" rel="nofollow">http://example-image(2).jpg</a>',
+            ),
+            'URL with brackets within path and with a extension' => array(
+                'text'     => 'http://example-(2)-image.jpg',
+                'expected' => '<a href="http://example-(2)-image.jpg" rel="nofollow">http://example-(2)-image.jpg</a>',
+            ),
+
             // @ticket 11211
             // Test with real comments which were incorrectly linked.