Changeset 2791

Timestamp:

01/11/2011 07:50:36 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Backport clean_url fixes to 0.9 branch.

File:

• branches/0.9/bb-includes/wp-functions.php (modified) (2 diffs)

branches/0.9/bb-includes/wp-functions.php

@@ -13 +13 @@
     $original_url = $url;
 
-    if ('' == $url) return $url;
+    if ( '' == $url )
+        return $url;
     $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a', '%0D', '%0A');
@@ -28 +29 @@
     // Replace ampersands and single quotes only when displaying.
     if ( 'display' == $context ) {
-        $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url);
+        $url = wp_kses_normalize_entities( $url );
+        $url = str_replace( '&', '&', $url );
         $url = str_replace( "'", ''', $url );
     }
 
     if ( !is_array($protocols) )
-        $protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet');
+        $protocols = array ('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn');
     if ( wp_kses_bad_protocol( $url, $protocols ) != $url )
         return '';