Changes from branches/2.3/wp-includes/formatting.php at r6183 to trunk/wp-includes/formatting.php at r6150

File:

• trunk/wp-includes/formatting.php (modified) (3 diffs)

trunk/wp-includes/formatting.php

@@ -1088 +1088 @@
 }
 
-function clean_url( $url, $protocols = null, $context = 'display' ) {
+function clean_url( $url, $protocols = null ) {
     $original_url = $url;
 
@@ -1104 +1104 @@
         $url = 'http://' . $url;
 
-    // Replace ampersands ony when displaying.
-    if ( 'display' == $context )
-        $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url);
-
+    $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url);
     if ( !is_array($protocols) )
         $protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet');
@@ -1113 +1110 @@
         return '';
 
-    return apply_filters('clean_url', $url, $original_url, $context);
-}
-
-function sanitize_url( $url, $protocols = null ) {
-    return clean_url( $url, $protocols, 'db');
+    return apply_filters('clean_url', $url, $original_url);
 }