Changeset 6015

Timestamp:

09/03/2007 03:59:12 PM (17 years ago)

Author:

ryan

Message:

Don't strip @ from url. Fix scheme prefixing. Props pishmishy. fixes #3299

File:

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

trunk/wp-includes/formatting.php

@@ -1081 +1081 @@
 
     if ('' == $url) return $url;
-    $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%]|i', '', $url);
+    $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@]|i', '', $url);
     $strip = array('%0d', '%0a');
     $url = str_replace($strip, '', $url);
     $url = str_replace(';//', '://', $url);
-    // Append http unless a relative link starting with / or a php file.
-    if ( strpos($url, '://') === false &&
+    /* If the URL doesn't appear to contain a scheme, we
+     * presume it needs http:// appended (unless a relative 
+     * link starting with / or a php file).
+    */
+    if ( strpos($url, ':') === false &&
         substr( $url, 0, 1 ) != '/' && !preg_match('/^[a-z0-9-]+?\.php/i', $url) )
         $url = 'http://' . $url;