Changeset 6449

Timestamp:

12/21/07 03:14:22 (7 months ago)

Author:

ryan

Message:

Be more selective in what we make clickable.

Files:

• trunk/wp-includes/formatting.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -627 +627 @@
-}
-
+function _make_url_clickable_cb($matches) {
+    $url = $matches[2];
+    $url = clean_url($url);
+    if ( empty($url) )
+        return $matches[0];
+        error_log($matches[0], 0);
+    return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>";
+}
+
+function _make_web_ftp_clickable_cb($matches) {
+    $dest = $matches[2];
+    $dest = 'http://' . $dest;
+    $dest = clean_url($dest);
+    if ( empty($dest) )
+        return $matches[0];
+
+    return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>";
+}
+
+function _make_email_clickable_cb($matches) {
+    $email = $matches[2] . '@' . $matches[3];
+    return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+}
+
-function make_clickable($ret) {
-    $ret = ' ' . $ret;
-    // in testing, using arrays here was found to be faster
-
-
-
-
-
-
-
-
-
+
+
+
-    // this one is not in an array because we need it to run last, for cleanup of accidental links within links
-    $ret = preg_replace("#(<a( [^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i", "$1$3</a>", $ret);