Changeset 9179

Timestamp:

10/14/2008 10:58:30 PM (16 years ago)

Author:

matt

Message:

clean_url improvements, Hat tip: markjaquith. Reviewed by nbachiyskip. Fixes #7386.

File:

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

trunk/wp-includes/formatting.php

@@ -1671 +1671 @@
 
     if ('' == $url) return $url;
-    $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@()\\x80-\\xff]|i', '', $url);
+    $url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$*\'()\\x80-\\xff]|i', '', $url);
     $strip = array('%0d', '%0a');
     $url = str_replace($strip, '', $url);
@@ -1683 +1683 @@
         $url = 'http://' . $url;
 
-    // Replace ampersands only when displaying.
-    if ( 'display' == $context )
+    // Replace ampersands and single quotes only when displaying.
+    if ( 'display' == $context ) {
         $url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&$1', $url);
+        $url = str_replace( "'", ''', $url ); 
+    }
 
     if ( !is_array($protocols) )