Wordpress 3.0.4

[autoinstalls/wordpress.git] / wp-includes / formatting.php

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 58c826f903e6414209e60bbff1ff6163b0376e4c..3d203e6fc2d71144cbc336eb181a0637b1fb129e 100644 (file)
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -2236,7 +2236,8 @@ function esc_url( $url, $protocols = null, $_context = 'display' ) {
 
        // 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 );
        }