Changeset 6182 for trunk/wp-includes/formatting.php

Timestamp:

10/03/2007 04:16:55 PM (17 years ago)

Author:

ryan

Message:

Add sanitize_url. Don't convert ampersands in URLs when saving to DB. fixes #4411 for trunk

File:

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

trunk/wp-includes/formatting.php

@@ -1088 +1088 @@
 }
 
-function clean_url( $url, $protocols = null ) {
+function clean_url( $url, $protocols = null, $context = 'display' ) {
     $original_url = $url;
 
@@ -1104 +1104 @@
         $url = 'http://' . $url;
 
-    $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url);
+    // Replace ampersands ony when displaying.
+    if ( 'display' == $context )
+        $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');
@@ -1110 +1113 @@
         return '';
 
-    return apply_filters('clean_url', $url, $original_url);
+    return apply_filters('clean_url', $url, $original_url, $context);
+}
+
+function sanitize_url( $url, $protocols = null ) {
+    return clean_url( $url, $protocols, 'db');
 }