Ticket #23308: 23308.diff

src/wp-includes/formatting.php

@@ -1663 +1663 @@
                 $url = substr( $url, 0, strrpos( $url, ')' ) );
         }
 
-        $url = esc_url($url);
+        // After removing the unmatched parentheses suffix,
+        // we need to re-ensure the URL does not end with punctuation.
+        $trimmed_url = rtrim( $url, "'.,;:!?" ); // taken from the list of punctuation characters in make_clickable()
+        $suffix = substr( $url, strlen( $trimmed_url ) ) . $suffix;
+
+        $url = esc_url($trimmed_url);
         if ( empty($url) )
                 return $matches[0];
 
@@ -1761 +1766 @@
                                         [\\w]{1,20}+://                                # Scheme and hier-part prefix
                                         (?=\S{1,2000}\s)                               # Limit to URLs less than about 2000 characters long
                                         [\\w\\x80-\\xff#%\\~/@\\[\\]*(+=&$-]*+         # Non-punctuation URL character
-                                        (?:                                            # Unroll the Loop: Only allow puctuation URL character if followed by a non-punctuation URL character
-                                                [\'.,;:!?)]                            # Punctuation URL character
+                                        (?:                                            # Unroll the Loop: Only allow puctuation URL characters if followed by a non-punctuation URL character
+                                                [\'.,;:!?)]+                           # Punctuation URL character
                                                 [\\w\\x80-\\xff#%\\~/@\\[\\]*(+=&$-]++ # Non-punctuation URL character
                                         )*
                                 )

tests/phpunit/tests/formatting/MakeClickable.php

@@ -389 +389 @@
                                   href='mailto:someone@example.com'>someone@example.com</a>";
                 $this->assertEquals( $html, make_clickable( $html ) );
         }
+
+        /**
+         * @ticket 23308
+         */
+        function test_parentheses_with_trailing_extension() {
+                $urls_before = array(
+                        'http://www.wordpress.org/some-(parentheses).html',
+                        'foo http://www.wordpress.org/some-(parentheses).html bar',
+                );
+                $urls_expected = array(
+                        '<a href="http://www.wordpress.org/some-(parentheses).html" rel="nofollow">http://www.wordpress.org/some-(parentheses).html</a>',
+                        'foo <a href="http://www.wordpress.org/some-(parentheses).html" rel="nofollow">http://www.wordpress.org/some-(parentheses).html</a> bar',
+                );
+                foreach ($urls_before as $key => $url) {
+                        $this->assertEquals( $urls_expected[$key], make_clickable( $url ) );
+                }
+        }
+
+        /**
+         * @ticket 23308
+         */
+        function test_github_range_urls() {
+                $urls_before = array(
+                        'https://github.com/WordPress/WordPress/compare/3.9...3.9.1',
+                        'foo https://github.com/WordPress/WordPress/compare/3.9...3.9.1 bar',
+                );
+                $urls_expected = array(
+                        '<a href="https://github.com/WordPress/WordPress/compare/3.9...3.9.1" rel="nofollow">https://github.com/WordPress/WordPress/compare/3.9...3.9.1</a>',
+                        'foo <a href="https://github.com/WordPress/WordPress/compare/3.9...3.9.1" rel="nofollow">https://github.com/WordPress/WordPress/compare/3.9...3.9.1</a> bar',
+                );
+                foreach ($urls_before as $key => $url) {
+                        $this->assertEquals( $urls_expected[$key], make_clickable( $url ) );
+                }
+        }
 }