Changeset 26974

Timestamp:

01/17/2014 09:31:59 AM (11 years ago)

Author:

nacin

Message:

make_clickable: When cleaning up accidental links within links, account for the tag being split by newlines.

props dd32.
fixes #19028.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -1743 +1743 @@
 
     // Cleanup of accidental links within links
-    $r = preg_replace( '#(<a( [^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+    $r = preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
     return $r;
 }

trunk/tests/phpunit/tests/formatting/MakeClickable.php

@@ -381 +381 @@
         }
     }
+
+    /**
+     * @ticket 19028
+     */
+    function test_line_break_in_existing_clickable_link() {
+        $html = "<a
+                  href='mailto:someone@example.com'>someone@example.com</a>";
+        $this->assertEquals( $html, make_clickable( $html ) );
+    }
 }